From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- net-analyzer/Manifest.gz | Bin 47030 -> 47171 bytes net-analyzer/argus-clients/Manifest | 8 +- .../argus-clients/argus-clients-3.0.8.2-r2.ebuild | 4 +- .../argus-clients/argus-clients-3.0.8.2-r3.ebuild | 75 +++++ .../argus-clients/argus-clients-3.0.8.2.ebuild | 6 +- .../argus-clients/argus-clients-3.0.8.ebuild | 6 +- .../files/argus-clients-3.0.8.2-my_bool.patch | 42 +++ net-analyzer/argus/Manifest | 2 +- net-analyzer/argus/argus-3.0.8.2-r1.ebuild | 4 +- net-analyzer/arping/Manifest | 6 +- net-analyzer/arping/arping-2.18.ebuild | 29 -- net-analyzer/arping/arping-2.20.ebuild | 34 ++ net-analyzer/arping/arping-9999.ebuild | 2 +- net-analyzer/barnyard2/Manifest | 3 +- net-analyzer/barnyard2/barnyard2-1.13.ebuild | 1 + .../barnyard2/files/barnyard2-1.13-my_bool.patch | 11 + net-analyzer/cacti-spine/Manifest | 4 +- .../cacti-spine/cacti-spine-1.2.5-r1.ebuild | 53 ++++ net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild | 50 --- net-analyzer/cacti-spine/cacti-spine-99999.ebuild | 52 ++++ .../files/cacti-spine-1.2.5-my_bool.patch | 11 + net-analyzer/ettercap/Manifest | 2 +- net-analyzer/ettercap/ettercap-0.8.3.ebuild | 2 +- net-analyzer/icinga2/Manifest | 4 +- net-analyzer/icinga2/icinga2-2.10.6.ebuild | 3 +- net-analyzer/icinga2/icinga2-9999.ebuild | 3 +- net-analyzer/ipsumdump/Manifest | 4 +- .../files/ipsumdump-1.86-SIOCGSTAMP.patch | 10 + net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild | 37 +++ net-analyzer/ipsumdump/ipsumdump-1.86.ebuild | 3 +- net-analyzer/nagios-core/Manifest | 4 +- net-analyzer/nagios-core/nagios-core-4.4.4.ebuild | 213 ------------- .../nagios-core/nagios-core-4.4.5-r3.ebuild | 232 ++++++++++++++ .../nagios-plugins-linux-madrisan/Manifest | 3 + .../nagios-plugins-linux-madrisan/metadata.xml | 15 + .../nagios-plugins-linux-madrisan-25-r1.ebuild | 45 +++ net-analyzer/nagios-plugins/Manifest | 1 + .../nagios-plugins/nagios-plugins-2.2.1-r4.ebuild | 118 +++++++ net-analyzer/nagios/Manifest | 2 +- net-analyzer/nagios/nagios-4.4.4.ebuild | 15 - net-analyzer/nagios/nagios-4.4.5.ebuild | 15 + net-analyzer/ndoutils/Manifest | 2 +- net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild | 95 ------ net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild | 95 ++++++ net-analyzer/ndsad/Manifest | 1 + net-analyzer/ndsad/ndsad-1.33-r2.ebuild | 45 +++ net-analyzer/nessus-agent-bin/Manifest | 2 + .../nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild | 64 ++++ net-analyzer/net-snmp/Manifest | 11 +- .../files/net-snmp-5.7.3-mariadb-10.2.patch | 56 ---- .../net-snmp/files/net-snmp-5.7.3-perl524-2.patch | 70 ----- .../net-snmp/files/net-snmp-5.8-my_bool.patch | 23 ++ net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild | 192 ------------ net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild | 194 ------------ net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild | 198 ------------ net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild | 199 ++++++++++++ net-analyzer/netdata/Manifest | 2 + net-analyzer/netdata/netdata-1.17.0.ebuild | 132 ++++++++ net-analyzer/nethogs/Manifest | 2 - net-analyzer/nethogs/nethogs-0.8.1.ebuild | 32 -- net-analyzer/nrpe/Manifest | 11 +- net-analyzer/nrpe/files/nrpe-2.14-multiline.patch | 204 ------------ .../nrpe/files/nrpe-2.15-autoconf-header.patch | 24 -- .../files/nrpe-2.15-metachar-security-fix.patch | 26 -- net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch | 39 --- net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch | 50 --- net-analyzer/nrpe/metadata.xml | 3 - net-analyzer/nrpe/nrpe-2.15-r3.ebuild | 140 --------- net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild | 89 ++++++ net-analyzer/nrpe/nrpe-3.2.1.ebuild | 77 ----- net-analyzer/ntopng/Manifest | 10 +- .../ntopng/files/ntopng-3.8-missing-min.patch | 19 ++ .../ntopng/files/ntopng-3.8-mysqltool.patch | 17 + .../ntopng/files/ntopng-3.8-ndpi-call.patch | 12 + .../ntopng/files/ntopng-3.8-ndpi-includes.patch | 14 + net-analyzer/ntopng/ntopng-2.4-r1.ebuild | 86 ++++++ net-analyzer/ntopng/ntopng-2.4.ebuild | 86 ------ net-analyzer/ntopng/ntopng-3.0-r3.ebuild | 75 ----- net-analyzer/ntopng/ntopng-3.0-r4.ebuild | 75 +++++ net-analyzer/ntopng/ntopng-3.8.ebuild | 76 +++++ net-analyzer/pypacker/Manifest | 2 + net-analyzer/pypacker/pypacker-4.8.ebuild | 27 ++ net-analyzer/sarg/Manifest | 2 + net-analyzer/sarg/files/sarg-2.3.11-Werror.patch | 25 ++ net-analyzer/sarg/sarg-2.3.11-r2.ebuild | 44 +++ net-analyzer/speedtest-cli/Manifest | 6 +- .../speedtest-cli/speedtest-cli-2.0.2.ebuild | 27 -- .../speedtest-cli/speedtest-cli-2.1.1.ebuild | 2 +- .../speedtest-cli/speedtest-cli-2.1.2.ebuild | 27 ++ net-analyzer/tcpdump/Manifest | 4 +- .../tcpdump/files/tcpdump-4.9.2-includedir.patch | 65 ++++ net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild | 106 +++++++ net-analyzer/tcpdump/tcpdump-9999.ebuild | 4 +- net-analyzer/tcpflow/Manifest | 2 +- net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild | 60 ++++ net-analyzer/tcpflow/tcpflow-1.5.2.ebuild | 57 ---- net-analyzer/tcpstat/Manifest | 2 + .../files/tcpstat-1.5-_DEFAULT_SOURCE.patch | 11 + net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild | 45 +++ net-analyzer/telegraf/Manifest | 2 +- net-analyzer/telegraf/telegraf-1.10.4.ebuild | 2 + net-analyzer/vnstat/Manifest | 4 +- net-analyzer/vnstat/vnstat-2.2.ebuild | 68 ---- net-analyzer/vnstat/vnstat-2.4.ebuild | 68 ++++ net-analyzer/wireshark/Manifest | 12 +- .../files/wireshark-1.99.8-qtchooser.patch | 10 - .../wireshark/files/wireshark-2.6.2-qtsvg.patch | 17 - .../files/wireshark-2.6.6-androiddump-wsutil.patch | 18 -- .../files/wireshark-99999999-androiddump.patch | 10 - net-analyzer/wireshark/wireshark-2.6.7.ebuild | 240 --------------- net-analyzer/wireshark/wireshark-3.0.1.ebuild | 2 +- net-analyzer/wireshark/wireshark-3.0.2.ebuild | 246 --------------- net-analyzer/wireshark/wireshark-3.0.3.ebuild | 2 +- net-analyzer/zabbix/Manifest | 8 +- net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild | 341 +++++++++++++++++++++ net-analyzer/zabbix/zabbix-2.2.16.ebuild | 341 --------------------- net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild | 341 +++++++++++++++++++++ net-analyzer/zabbix/zabbix-2.2.21.ebuild | 341 --------------------- net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild | 341 +++++++++++++++++++++ net-analyzer/zabbix/zabbix-2.2.23.ebuild | 341 --------------------- net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild | 328 ++++++++++++++++++++ net-analyzer/zabbix/zabbix-3.2.11.ebuild | 328 -------------------- 122 files changed, 3616 insertions(+), 3995 deletions(-) create mode 100644 net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild create mode 100644 net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch delete mode 100644 net-analyzer/arping/arping-2.18.ebuild create mode 100644 net-analyzer/arping/arping-2.20.ebuild create mode 100644 net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch create mode 100644 net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild delete mode 100644 net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild create mode 100644 net-analyzer/cacti-spine/cacti-spine-99999.ebuild create mode 100644 net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch create mode 100644 net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch create mode 100644 net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild delete mode 100644 net-analyzer/nagios-core/nagios-core-4.4.4.ebuild create mode 100644 net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild create mode 100644 net-analyzer/nagios-plugins-linux-madrisan/Manifest create mode 100644 net-analyzer/nagios-plugins-linux-madrisan/metadata.xml create mode 100644 net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild delete mode 100644 net-analyzer/nagios/nagios-4.4.4.ebuild create mode 100644 net-analyzer/nagios/nagios-4.4.5.ebuild delete mode 100644 net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild create mode 100644 net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild create mode 100644 net-analyzer/ndsad/ndsad-1.33-r2.ebuild create mode 100644 net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild delete mode 100644 net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch delete mode 100644 net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch create mode 100644 net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch delete mode 100644 net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild delete mode 100644 net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild delete mode 100644 net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild create mode 100644 net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild create mode 100644 net-analyzer/netdata/netdata-1.17.0.ebuild delete mode 100644 net-analyzer/nethogs/nethogs-0.8.1.ebuild delete mode 100644 net-analyzer/nrpe/files/nrpe-2.14-multiline.patch delete mode 100644 net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch delete mode 100644 net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch delete mode 100644 net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch delete mode 100644 net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch delete mode 100644 net-analyzer/nrpe/nrpe-2.15-r3.ebuild create mode 100644 net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild delete mode 100644 net-analyzer/nrpe/nrpe-3.2.1.ebuild create mode 100644 net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch create mode 100644 net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch create mode 100644 net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch create mode 100644 net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch create mode 100644 net-analyzer/ntopng/ntopng-2.4-r1.ebuild delete mode 100644 net-analyzer/ntopng/ntopng-2.4.ebuild delete mode 100644 net-analyzer/ntopng/ntopng-3.0-r3.ebuild create mode 100644 net-analyzer/ntopng/ntopng-3.0-r4.ebuild create mode 100644 net-analyzer/ntopng/ntopng-3.8.ebuild create mode 100644 net-analyzer/pypacker/pypacker-4.8.ebuild create mode 100644 net-analyzer/sarg/files/sarg-2.3.11-Werror.patch create mode 100644 net-analyzer/sarg/sarg-2.3.11-r2.ebuild delete mode 100644 net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild create mode 100644 net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild create mode 100644 net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch create mode 100644 net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild create mode 100644 net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild delete mode 100644 net-analyzer/tcpflow/tcpflow-1.5.2.ebuild create mode 100644 net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch create mode 100644 net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild delete mode 100644 net-analyzer/vnstat/vnstat-2.2.ebuild create mode 100644 net-analyzer/vnstat/vnstat-2.4.ebuild delete mode 100644 net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch delete mode 100644 net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch delete mode 100644 net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch delete mode 100644 net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch delete mode 100644 net-analyzer/wireshark/wireshark-2.6.7.ebuild delete mode 100644 net-analyzer/wireshark/wireshark-3.0.2.ebuild create mode 100644 net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild delete mode 100644 net-analyzer/zabbix/zabbix-2.2.16.ebuild create mode 100644 net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild delete mode 100644 net-analyzer/zabbix/zabbix-2.2.21.ebuild create mode 100644 net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild delete mode 100644 net-analyzer/zabbix/zabbix-2.2.23.ebuild create mode 100644 net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild delete mode 100644 net-analyzer/zabbix/zabbix-3.2.11.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 31ed472aedcf..08d3c0605a53 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index 65bd37cfb510..3355fd01cf4d 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -2,10 +2,12 @@ AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 521 BLAKE2B 729ad AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b58fd646192437c25cff3a13752f5c94a3b5fab6f3f5ef265c2a51c9768e90b9bf8bbb197d363ab132f27f967b925ce19a98f66ed2020d SHA512 17910c0e2e2d3efefd1efe713bea5b394087415d103aa18254c7f8e8e4f4aae7d8670db8ab9d6045c145bfc0d5e804c653eca6e1c169813075c1af37ff01a0b2 AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770 +AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5 AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855 DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2 -EBUILD argus-clients-3.0.8.2-r2.ebuild 1517 BLAKE2B 47512e061e1fea4b5b1fd1d2dc0e980b01ef98847cb4efdf944f1999721e17caa8d65a01018f84720e4b457f3cd7bb0447b887a8c80aa072bac4ff561f410535 SHA512 a3c0fc9f20f14860a98cca43a3f4edaf2be91e51876c8fd923434902856baedcc6fe07f46a22cd99864289d40072bd24e53007b98cc737e4110f4a28a3f4dc48 -EBUILD argus-clients-3.0.8.2.ebuild 1453 BLAKE2B f18f8d5c4e85d441b72e6490730dd6b6f9e0c04e433caa58b9fe297d2a40ba3f811f113a7739a8b7df67aafd07d254c7561703ff5bd5fad523879502567eade1 SHA512 b5fd648853deb3a81982a462da9e6ac1c8cbcc453fb6144e5afa303a6465f33daf846212e47d781c33b9e5a0737fa8fcc6dcb0edc4ebf4a1f59583606382851b -EBUILD argus-clients-3.0.8.ebuild 1446 BLAKE2B aeb8501a05352c57c5cf5338ee19f598549d96df3d39da2864da8eefa32d3d59e48b0e8f89de39970524bba1a861a3dbf7b50110c815eecdd54258d1fa1f98cb SHA512 90119ef5268e3afafb73b97d4eab3b55d761609064b1d1f371f908715d49f81992d35d6f86466f312e106b014410b1afe4b6815d5b626a2e0485f74cd968f147 +EBUILD argus-clients-3.0.8.2-r2.ebuild 1519 BLAKE2B fbd75810aa28eeaa2f9e71cdc3eb9576f0f4819cecfed3c39595e374c800870f877ec5cf82d6ba9e792fc0cba2a88cf6e1725ee74d7312a4b43939212972f4d6 SHA512 a5109d04f041dddd80e7b0de7d1fc1539eb3c5fcd10ca2e68592c54d11a7be2132996265aeb38a21fccdfaa8572c876353262c722a75f27f3d840bb4024ddc98 +EBUILD argus-clients-3.0.8.2-r3.ebuild 1562 BLAKE2B cb0d32880096b5c421b690567bdad37ffda750e08f18ace6818a98c5d8608fe3cb6fc69def073dafacd68f0158e10894ff0c9fd92b30d3fde04af59ff62eba24 SHA512 bcf1a4da98180e1b841f14e4ff992a8b9003e38bd2ad5b584a4d46262c7edb68d384fd00bca5e09cde7929dc36dd40ec33c284c42c821fba6f1e9b10738c0afb +EBUILD argus-clients-3.0.8.2.ebuild 1452 BLAKE2B 52eb69a7b9cd55066c118503866915b361b30f0fa0d6732e4bf31d20e9029b9a5350bdce7413fc768b9a552782b30731de6c20f6a7cec6740177a7e80007c033 SHA512 15f49d72ad76e88745bb3e0fe2966348edc220ea6af06eb65b0e3274f626fbf73931d53f47ac3681874e2d51ad2f5f53958d9bd77f717ed821b0157003bf6ffc +EBUILD argus-clients-3.0.8.ebuild 1445 BLAKE2B 572a61f3c2b3b86886e984c1ca6ca25945289d7be5f6b8efc240bebb1c070c7399f7c1579317c77f3b92278c9bdfc72f66d6b3e5159b97e370e224149590ea34 SHA512 fb741600733cfe208ea70861b17f34bd238d26d95cd09f233e6febf49793e2e2df816f26fef5f69f44af69d0fdd17ce269666c4bf319c8efceea3e9f55f776a0 MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780 diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild index 42799057487b..d87060d87bec 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild @@ -5,8 +5,8 @@ EAPI=6 inherit autotools toolchain-funcs DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="http://www.qosient.com/argus/" -SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz" +HOMEPAGE="https://www.qosient.com/argus/" +SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild new file mode 100644 index 000000000000..637ef50ad05a --- /dev/null +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools toolchain-funcs + +DESCRIPTION="Clients for net-analyzer/argus" +HOMEPAGE="https://www.qosient.com/argus/" +SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug ft geoip mysql sasl tcpd" + +ARGUS_CDEPEND=" + net-analyzer/rrdtool[perl] + net-libs/libpcap + net-libs/libtirpc:= + sys-libs/ncurses:= + sys-libs/readline:= + sys-libs/zlib + ft? ( net-analyzer/flow-tools ) + geoip? ( dev-libs/geoip ) + mysql? ( dev-db/mysql-connector-c:0= ) + sasl? ( dev-libs/cyrus-sasl ) +" +RDEPEND=" + ${ARGUS_CDEPEND} +" +DEPEND=" + ${ARGUS_CDEPEND} + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-ar.patch + "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch + "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + tc-export AR RANLIB + + use debug && touch .debug + econf \ + $(use_with ft libft) \ + $(use_with geoip GeoIP /usr/) \ + $(use_with sasl) \ + $(use_with tcpd wrappers) \ + $(use_with mysql mysql /usr) +} + +src_compile() { + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + RANLIB=$(tc-getRANLIB) \ + CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" +} + +src_install() { + dobin bin/ra* + dodoc ChangeLog CREDITS README CHANGES + doman man/man{1,5}/* +} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild index efa07fed3bd7..d16c7f6422a6 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit autotools eutils toolchain-funcs DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="http://www.qosient.com/argus/" -SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz" +HOMEPAGE="https://www.qosient.com/argus/" +SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild index 7dbfc5a721a2..742c6cbebee7 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit autotools eutils toolchain-funcs DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="http://www.qosient.com/argus/" -SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz" +HOMEPAGE="https://www.qosient.com/argus/" +SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch new file mode 100644 index 000000000000..99cd6b255ae7 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch @@ -0,0 +1,42 @@ +--- a/examples/ramysql/rasql.c ++++ b/examples/ramysql/rasql.c +@@ -414,7 +414,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL; + char *sptr = NULL, *ptr; + MYSQL_RES *mysqlRes; +--- a/examples/ramysql/rasqlinsert.c ++++ b/examples/ramysql/rasqlinsert.c +@@ -7026,7 +7026,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + char *sptr = NULL, *ptr; + char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL; + MYSQL_RES *mysqlRes; +--- a/examples/ramysql/rasqltimeindex.c ++++ b/examples/ramysql/rasqltimeindex.c +@@ -539,7 +539,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + char *sptr = NULL, *ptr; + char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL; + MYSQL_RES *mysqlRes; +@@ -797,7 +797,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + unsigned int RaTableFlags = 0; + int retn = 0, x; + char *sptr = NULL, *ptr; diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index d61af810bbda..86bbb2c5b682 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -4,5 +4,5 @@ AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385 AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 -EBUILD argus-3.0.8.2-r1.ebuild 2051 BLAKE2B 07a38831af71a6b58a65cb5a04572ea82fdd3814d1227b06ecf5fdfbb2c8acd70832b506dc21542680f14186d0c1af0acc80c0304fd236f03c52d888fda3d916 SHA512 5c7cd31160f04f545109716ff050b8ca235d17bf2a4c92b1e75ee1af1e5fddfc2c318f5f3d6e6256689f326f0c4b878a7373be904eeedc7819c3ad9e2e060f01 +EBUILD argus-3.0.8.2-r1.ebuild 2049 BLAKE2B 1168c4cc70b9d4abd9c255b19f930293f2bd025a670dc2aefbdc0ea6a8cefaff1744dc3f08fe651fc5230a8a0af58436cc008c4ee9d38bcfa080d701c275b000 SHA512 808d7edf1467798714a0eab02336baa6f223fc4c1ffcd707018135eb99856f109ea713b98326cd7c796083f2b62a743229806f848fa013af49339ce44c89277f MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild index 7b0216859466..83eacad11e44 100644 --- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild +++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit autotools eutils user DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="http://www.qosient.com/argus/" +HOMEPAGE="https://www.qosient.com/argus/" SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz" LICENSE="GPL-3" diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest index 718d620dd1aa..b72eb72431f8 100644 --- a/net-analyzer/arping/Manifest +++ b/net-analyzer/arping/Manifest @@ -1,8 +1,8 @@ DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2 -DIST arping-2.18.tar.gz 175691 BLAKE2B 42372f629b66568868ffa6d5ed5d050f0eeb53b6a3b804bbd87d273d4c381d249b0b2e41f641f7cd2d5d93d5aa18882c8e623461db8052dd2393d6822d8ca222 SHA512 0ce54bd834695d1f624e9846d1796a316e5a733b83cdeaf745f522e1311f082d646c265a90b90b524d7e718070d61dd9ca767b5365f9fd5bd0a807e37c4d4c89 DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2 +DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282 EBUILD arping-2.17.ebuild 706 BLAKE2B e7c8265c088471fb2a158db710986fe67c2603c3b5fc19bb0d355f024baff962c31722ad255e3e747b106151d19ac77c0c0b2b994652d9cab72a5581467b5384 SHA512 8537da18d1a79d669899c82dc6344f27467824257ed327a070168060e745d23996d85692034cedf85b3a1e0073fb06f91f1b7615a134832a5d8139be0b8b127d -EBUILD arping-2.18.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472 EBUILD arping-2.19.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472 -EBUILD arping-9999.ebuild 628 BLAKE2B 60e4bdaefd3472a9cbc10e15c79948d0d2dc77d0f3e3fc77c3c432753af6627ffcab4891af054eff2701ccb3519b9acc81a3746259838bfff228112a7019de2c SHA512 c478daa886e12ae738a7d8a134bd18f43bb272e31694c1166e5d59fcc8c4974c81d320a4553061eb4b3a516ed9a1bddf7dc0c9ebc775182088c3b775758d8170 +EBUILD arping-2.20.ebuild 794 BLAKE2B 732883ce8dc887afd35c4d411190d885c125405cefbf1b25d18f61a240949b8d654cf914969989092c68b99ee068172bff36d4fd794f642eacb1f1a18ed872a4 SHA512 eab36d027018099d16bd4fa8e71895a3bee76aa3298f2769ebf58b2387ad31e02bec27a0f2e6fc191b8b47d20b8a7be43697bd2352d5d29708f794740c52e255 +EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/arping/arping-2.18.ebuild b/net-analyzer/arping/arping-2.18.ebuild deleted file mode 100644 index 1552c81188ae..000000000000 --- a/net-analyzer/arping/arping-2.18.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" - -FILECAPS=( cap_net_raw /usr/sbin/arping ) diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild new file mode 100644 index 000000000000..9f3f308a61fe --- /dev/null +++ b/net-analyzer/arping/arping-2.20.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools fcaps + +DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" +HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" +SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="test" + +CDEPEND=" + net-libs/libpcap + net-libs/libnet:1.1 +" +DEPEND=" + ${CDEPEND} + test? ( dev-libs/check ) +" +RDEPEND=" + ${CDEPEND} + !net-misc/iputils[arping(+)] +" +FILECAPS=( cap_net_raw /usr/sbin/arping ) +S=${WORKDIR}/${PN}-${P} + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild index ee101c39dcdd..20b7fc882067 100644 --- a/net-analyzer/arping/arping-9999.ebuild +++ b/net-analyzer/arping/arping-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools fcaps git-r3 DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest index c1cca42e98c5..90ac598fb49a 100644 --- a/net-analyzer/barnyard2/Manifest +++ b/net-analyzer/barnyard2/Manifest @@ -1,11 +1,12 @@ AUX barnyard2-1.13-free.patch 235 BLAKE2B 5c96aa8048a8445ce34c4bed29d60ae66b82cd7758e58fb34c2ec96d0b1d43404ee24a5cf7f5815bf1201adf621fa954096000c52aba56db919c20f335dd7749 SHA512 40aa34cb3b778e17a917ae1791ba640060e6cbd6fff1b3edb43f95d4b187a57e2c826abbb6709d71d6b30b73a07a117f2a27b19600a0129462d9d5106ab40285 AUX barnyard2-1.13-libdir.patch 2976 BLAKE2B f940e9302aea3a55867c081de832dc4d2be6759c73152a9e204dad4987dd3975efe8dfe4e1d16ffd965d95205b5ef7eb178876e8bcc23dd3d6e5cb7c892bf84e SHA512 c87aec5043b7a589cc2c23464cadcb073d1a1da3c11491080b306f04191e7359942acf56fc42a85c7e52349ce5ae82bbc3dd26f886ae6f45191506b2cffdf8ce +AUX barnyard2-1.13-my_bool.patch 447 BLAKE2B dde68b66b62debca2d6b2acc81dae27520ba9fc72695fcd49822628ecc80073ef9b20e8dbe2861080bc32a59a625d9199465aeadb7c1f7f1472b48685e02ae57 SHA512 e7a58e512cca86f1867e7fd07d9c1c3c236d5ecb0cbfb175042c6175bd81c95ae01c637c7c3cc91e806b00fb45d30daf657703fa64b8d29cd33eeeccd705bb8f AUX barnyard2-1.13-odbc.patch 1453 BLAKE2B a238e0456227c82620a59b1b8b66d1e99a88baacf029a476851241cd5e795118d6b9cd3aada07013f67ee25b88568f63376c7a4eb64946321731daa1b1fb2f4f SHA512 34b2d744c933a007412536b95b7bd152425c37022c9d8c92b5e1f104baea60b831e2c0816a57e0a8f662975005a073b424408e6f5630432588add3a7c6ad28c9 AUX barnyard2-1.13-pcap-1.9.0.patch 944 BLAKE2B 143d2cc61e447d5c493a3d503e7e2020432fea9c5292b5837f20ef4e9bd5ba306180280a2bc3e25bd98ceb3859328e94f4967e88fccc74f5d9ebdd3e01be0179 SHA512 23d39af20e6a062547f57c9c0a3614bd5b1d08622611a455e7faa6201d12a9ce26e6985d61cae44e3d85842a596b34c921fe07c5ab88caa2a1c48542bda1563c AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f638872927bd4e2fe5d005225e257bd5971597ae62db5a1f10da2d092e086eb60fb6ea3b552801f992d8646 SHA512 25fb327829da9f23a100e69310dd57c1f99404dd9923f2ef73d90635013ca68678122ee5f45f2e267c7b2f6264fd8e57998b1730d4ee02d3c2f61f1fe72d1f5f AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423 DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246 DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666 -EBUILD barnyard2-1.13.ebuild 1881 BLAKE2B d0416ca8952ffbe4bba4cde68c7abb6ebf5207adbf356d154e21e665594c5bef305f96d1589a8913d999c4f1e422221163772bbf8aa24b8eeb9d02067f567c97 SHA512 ee78d77e42cdaa0899a5d85b837bb6279aa1e927faff82a110a18542e9d8af57489e71a0d408b06d89ddc35273e0988389d1d5c7aa30f4d35f114b9f7109c784 +EBUILD barnyard2-1.13.ebuild 1921 BLAKE2B b91c3c05f834a75e0b68bc2e881552d9db289721869c2418e1f908c78cabd99cea3687750fd6f54fe178c26ec027b32ded738d0ba7e223eb30bc8d7ab7536fc4 SHA512 0e13345b0b1f5c8c73b5eb0ff1ab0eee4e02baee928ab4ee521e51a1032a7044b9fe2148cc725c0cab73aead9accdd33c41a913b5669aff260438bd5c01767d5 EBUILD barnyard2-1.9-r2.ebuild 1720 BLAKE2B b05ec48d30fc48ecd74d814790ec61df13c7e7d2b98e389859dfdf4a05642e7fd5bb9f47d3b9b8a587f9a6a154657cbbb925af2e493cb951e889239e3a4c28f0 SHA512 0d0967ce5498054f075d163e407d1d04741c2329cee2ab205e1d4990e5918ec63f4948e75456e8b9ae628e9206a95b0a3602473074d9ff2be3313788b6302fcd MISC metadata.xml 1369 BLAKE2B 90fc4c66290d2b82184e109a0affc8550b38b4f1781215531496bef639150b5e610feca7182335c263db764f94c248fe16448025835b3f2bb6e92b1b5703b13a SHA512 3fcbf3709f433993d2fac432ff9175547afbcc646efa98dc49f1ffc8ea5b5f5bf3872a557994af885cd1d2106358bfbd2a8a08361218c7a87f07f46ce61746ce diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild index 7214129d7ec1..64f00cbb8a96 100644 --- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild +++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild @@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-2-${PV}" PATCHES=( "${FILESDIR}"/${PN}-1.13-free.patch "${FILESDIR}"/${PN}-1.13-libdir.patch + "${FILESDIR}"/${PN}-1.13-my_bool.patch "${FILESDIR}"/${PN}-1.13-odbc.patch "${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch ) diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch new file mode 100644 index 000000000000..9cd93220662e --- /dev/null +++ b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch @@ -0,0 +1,11 @@ +--- a/src/output-plugins/spo_database.h ++++ b/src/output-plugins/spo_database.h +@@ -357,7 +357,7 @@ + /* Herited from shared data globals */ + + unsigned long pThreadID; /* Used to store thread information and know if we "reconnected automaticaly" */ +- my_bool mysql_reconnect; /* We will handle it via the api. */ ++ u_int8_t mysql_reconnect; /* We will handle it via the api. */ + #endif /* ENABLE_MYSQL */ + + #ifdef ENABLE_POSTGRESQL diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest index cc1d6e4b0505..6b61205378c7 100644 --- a/net-analyzer/cacti-spine/Manifest +++ b/net-analyzer/cacti-spine/Manifest @@ -1,9 +1,11 @@ AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb87678bcf219bdf6d35ac2e6885047c87a26454f5bf0d3bbf618fccfcec06c31639bdc9f35e4c0267cf8f4de5bc13cb9 SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57 +AUX cacti-spine-1.2.5-my_bool.patch 208 BLAKE2B 001bedf38a4cf481aa451670f9e8712b11dcae4192b8517db6c44b060560afeb094d66410f7e42fcd3229f96490782f0bcf23c359010762d25a7879def3c3668 SHA512 c0e873444ae4f259786a3e2705a0e07485fd6676bf5024cc503a8b30285b3920322c57184105a75148d696a4e762d63ff29c260b855f9a0c3040afc8bd7ab548 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e DIST cacti-spine-1.2.2.tar.gz 2310298 BLAKE2B 782fb21fda6acf06434c6e996863a235670970b19e5218624723df4736c388c2d9f00c1e3cc623dad7973bcbbe7ae5d4bbe89e366c1f47ce83eac9b416f88cb4 SHA512 ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e DIST cacti-spine-1.2.5.tar.gz 105494 BLAKE2B 1bd2f33cee841fb7b05a1a32d3d0d2824c36ccdc69fbf52c48cfe2d7bdbface4c1925261c8643c19addde90346c5ecdee547d8014705dc34800f59eab6ac248c SHA512 5bbf5f68e0d3477d43afee57bc86bfeb61a3ddaa18f7c0e5e0c2413bde6646bcd662d93e4c124daa6eaef5bca5843fb359b733c5189d9f43a34a14fba7f03682 EBUILD cacti-spine-1.1.38-r2.ebuild 865 BLAKE2B d3ee48575e06d3936d7b05417549a6bbd0655f8b04f8e62b44f220615020016e373c9854b7b830efeda4fea76b0a133574a9e97f150ae6c62e029be6ec812147 SHA512 93a55f613d7f0be9301ab7d36e4bcbd9f518aa514bb43a70eec540848274b98574af5c8fb26ba8b21849c9c698005a7b7e404dfd29b2b04378308ca87cdda740 EBUILD cacti-spine-1.2.2-r1.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335 -EBUILD cacti-spine-1.2.5.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335 +EBUILD cacti-spine-1.2.5-r1.ebuild 977 BLAKE2B b95d683505702a0e4bb0e627c9d581e6668e5c97f6479d5e212ab60c0a079800f1c3cf77a15a24dec8076f0b65584ce4c14be4656717b2ec929f1b1f9c4da4dc SHA512 85dd5d7d273fab5cb939e95dc0eedd1f7e3ebf78faa4508f8211629e2f6ddd754fb138fefbe75f06a784f8f40172d70b6d1f4997e6eb97ecab91bfb397fa6b91 +EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38 diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild new file mode 100644 index 000000000000..752dc560a7cd --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="https://cacti.net/spine_info.php" +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" +IUSE="libressl" + +CDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-analyzer/net-snmp:= + dev-db/mysql-connector-c:0= +" +DEPEND=" + ${CDEPEND} + sys-apps/help2man +" +RDEPEND=" + ${CDEPEND} + >net-analyzer/cacti-0.8.8 +" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.8d-ping.patch + "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch + "${FILESDIR}"/${PN}-1.2.5-my_bool.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin spine + + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + + doman spine.1 + dodoc CHANGELOG +} diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild deleted file mode 100644 index 9a49a5087926..000000000000 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_P=${PN}-${PV/_p/-} - -DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" -HOMEPAGE="https://cacti.net/spine_info.php" -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" - -CDEPEND=" - dev-libs/openssl:0= - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -DEPEND=" - ${CDEPEND} - sys-apps/help2man -" -RDEPEND=" - ${CDEPEND} - >net-analyzer/cacti-0.8.8 -" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8d-ping.patch - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) - -src_prepare() { - default - - AT_M4DIR="config" eautoreconf -} - -src_install() { - dosbin spine - - insinto /etc/ - insopts -m0640 -o root - newins spine.conf{.dist,} - - doman spine.1 - dodoc CHANGELOG -} diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild new file mode 100644 index 000000000000..3eacb02e8472 --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools git-r3 + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="https://cacti.net/spine_info.php" +EGIT_REPO_URI="https://github.com/Cacti/spine" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="" +IUSE="libressl" + +CDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-analyzer/net-snmp:= + dev-db/mysql-connector-c:0= +" +DEPEND=" + ${CDEPEND} + sys-apps/help2man +" +RDEPEND=" + ${CDEPEND} + >net-analyzer/cacti-0.8.8 +" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.8d-ping.patch + "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin spine + + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + + doman spine.1 + dodoc CHANGELOG +} diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch new file mode 100644 index 000000000000..d9554bfa38c5 --- /dev/null +++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch @@ -0,0 +1,11 @@ +--- a/sql.c ++++ b/sql.c +@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) { + timeout = 5; + rtimeout = 10; + wtimeout = 20; +- my_bool reconnect = 1; ++ _Bool reconnect = 1; + + mysql_init(mysql); + diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest index 2776c976b45e..4e86ccca4ea2 100644 --- a/net-analyzer/ettercap/Manifest +++ b/net-analyzer/ettercap/Manifest @@ -3,6 +3,6 @@ AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7 EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba -EBUILD ettercap-0.8.3.ebuild 1758 BLAKE2B 743c128bc562577efe2d8e5ee07ecadbf4924932458776ccdf9a33b0a69cd48de8b1a0192b1a4da26b2b72e8556d7c57fa41c3c81503d8601059adfe7fa09aaf SHA512 5d40815ba0d90dd0db649e136b92d09bb9e25a767ce42879eaca4332bcbb6fd9d1c1ef32bd559b1bb2fa240f4e280f04cc24452d2e34656d05c428b735759433 +EBUILD ettercap-0.8.3.ebuild 1753 BLAKE2B 80c74dc437c36eaa73bdbe0d6347a426127f31508f5e6d252d44036c4941b5adb1be2e46af95c321051fefb02d5fd3612af349f1649fe59b802ff2b73ad75a44 SHA512 64f94012b5830d582cba3aab5305092a6d12982ed2a526a56704b661cead583235ba34b43d765fbf638829b005042199cf62030401a6acb840050caa0a1a0397 EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5 diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild index ec323be8df10..c1487e4a8cde 100644 --- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild +++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git" else SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd" fi IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test" diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index 37d10d6232f1..27c464159591 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -3,6 +3,6 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d EBUILD icinga2-2.10.5.ebuild 4737 BLAKE2B 82b6eff71862480ff9017a301a45d807e2ff8c23eaafd2ee5e7df29e75f90e7f33507bce3ee3d14b6c0deeece33a7b531f023e8429dd55779578c3ce82b99a44 SHA512 b10ae453454d9747f3368c39be3c380bd1409f48298d32d7380b68bfc8fffdbf48afe1271ba8c30766c23b64335f46fa3fddcd313598e94856acc3dad4f696bf -EBUILD icinga2-2.10.6.ebuild 4739 BLAKE2B 98edc856ce987b5e3b6ce3b7c13626392f1cd8c30f445aee583d20b35b07c86425eb12020461266f04ce009840f94c4636716c8ceb57ca7dac70ceae0c0cccfc SHA512 36f667896c130b61d2f76f29ec014207b60fc3dc9743a6723e51983e89be3bb4727d0243b516dd695b3f88265365ff2205e852546889911da2e530bef7cf7b93 -EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06 +EBUILD icinga2-2.10.6.ebuild 4724 BLAKE2B e4b6ed8fb5262e71342e59064de815e2da58d32cf59a011ecc849ce8a218491443e00a9204165dfa2cd89523c1eddebcc1b309f8375f3d00d3a52047ef9e1ad6 SHA512 3cb16eb643087a905cb6c7539d78e59757d063b6bb7b067953ad522d3a4c0261a4606fa8206d17b226b255cb9d4d1e1d67b9f7759b838219bcf3a202c5e1c838 +EBUILD icinga2-9999.ebuild 4726 BLAKE2B 540407f321222356e979a3c159c10aeb519688c75f7e9a6ae5ce3a5749c47c0217080934cbccc921808e3c70b32ea1e70914a30c8d23213a86a4b9b7d4f850c7 SHA512 6714fb5ce7f1e0c2d082a479091fdfb8d24776f2119cc1ed0419f2fc1c47b7bfc95ee113367743dc9de4c7266e015129075551640269b7b6bfd81860d2e5353c MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5 diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild index 8a9695a5e27b..7d8f56dd9e4c 100644 --- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild +++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild @@ -5,12 +5,11 @@ EAPI=6 if [[ ${PV} != 9999 ]]; then inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" else inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" EGIT_BRANCH="master" - KEYWORDS="" fi DESCRIPTION="Distributed, general purpose, network monitoring engine" diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 913217ef694f..d8066e1db2f0 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,6 @@ else inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" EGIT_BRANCH="master" - KEYWORDS="" fi DESCRIPTION="Distributed, general purpose, network monitoring engine" diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest index 302786dd6675..d1824600f258 100644 --- a/net-analyzer/ipsumdump/Manifest +++ b/net-analyzer/ipsumdump/Manifest @@ -1,5 +1,7 @@ +AUX ipsumdump-1.86-SIOCGSTAMP.patch 228 BLAKE2B 05abaaba5619f0eac3d0dda66ad948afc7aa3cca3660fa9a89a35252e92408a2ffe9f3add385a851651439dd2bfbfec0164619c1cc22faad8269de4d00b61336 SHA512 bbf0737f8825e309f9fe548b0ea385d5c6926e59aabc90545d72ec301147a14607a648b0be90adf7f81874b9efd8bf6db59ad0103e7f8a54aa62bd61450e8cf2 DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65 EBUILD ipsumdump-1.85.ebuild 566 BLAKE2B 21324b6effeee5a7d4c148aac10c127c50e69a4c1a79f613b73dc44e7578eb137e297fa6dc7ebd1c00f74f1f088330a07be3be0a17ece27acff7edab367b13b1 SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d -EBUILD ipsumdump-1.86.ebuild 569 BLAKE2B 39b94566b1a0784ada70b8c0da9a57aa0e291c468ceca1fea03acba601843ce70a1a0a53a9292e76548f6eef68969f52a31422ca9b784a83697070df77cb4aef SHA512 6e7a9ba5b8c93c8073588960c753d6626a9382c045ff94fc5637da90fba221a1b11410f328a467f43fcfad5c4216daea4a4a244ebd67b9d346f521b21f68db06 +EBUILD ipsumdump-1.86-r1.ebuild 641 BLAKE2B af657021aeed8a2752c2efc8119252636537deee7b8ce44024549120159ee3bbada4e5add37f82a2ccc57d6331801a1838ebe635f11b810e49e5024cf8a55772 SHA512 9e9361a75e7459cd16c77af2d35b1cd5a42ae1af0cdfb17a55cdff018eb4c9bd60be5746f70514b2282feacb41bb7328b1db4a980dec8c05413a3261e131fddf +EBUILD ipsumdump-1.86.ebuild 586 BLAKE2B 5a7328c107e4c8356532f9257ea1af8ba5a4bdbfa9bb8daaff9cdedb7220b658d3dced093d0b0331ac46107d05d93f0f693a2c7b878b295e17b1eb10edc16d09 SHA512 21143b4e07e5d42aac54ebee738af1af6a29c6a2cb279f9d5f3207dd859692cb970a21e37c0b90271488d6813d64c6dfe0582444b6caf088016c6c9ab721582c MISC metadata.xml 563 BLAKE2B 1c76f973fe5a6165461b1822b83462cc49c658ce95d020e38a3f5eb4fd8ae3e5e5a455491ca4e9da2089f439757cd21ec9788c5ce1f845421a3a030255f7bdb4 SHA512 1867ca535fabb5e70808491cea9339e91e21009f30526dccbbf29594bba57261d98a10b43d096f24b84d476a4dedfd9be1ca7fbbc3445ddde928580789914432 diff --git a/net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch b/net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch new file mode 100644 index 000000000000..c2f0a74fff11 --- /dev/null +++ b/net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch @@ -0,0 +1,10 @@ +--- a/src/fromdevice.cc ++++ b/src/fromdevice.cc +@@ -47,6 +47,7 @@ + + #if FROMDEVICE_ALLOW_LINUX + # include ++# include + # include + # include + # include diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild new file mode 100644 index 000000000000..25325a3484db --- /dev/null +++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" +HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" +SRC_URI="${HOMEPAGE}${P}.tar.gz" + +LICENSE="the-Click-license" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ipv6 +nanotimestamp" + +RDEPEND=" + net-libs/libpcap +" +DEPEND=" + ${RDEPEND} + dev-lang/perl + dev-libs/expat + sys-apps/texinfo + virtual/os-headers +" +DOCS=( + NEWS.md + README.md +) +PATCHES=( + "${FILESDIR}"/${PN}-1.86-SIOCGSTAMP.patch +) + +src_configure() { + econf \ + $(use_enable ipv6 ip6) \ + $(use_enable nanotimestamp) +} diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild index 182f6ec8e8f8..784df50ece56 100644 --- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild +++ b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,6 +20,7 @@ DEPEND=" dev-lang/perl dev-libs/expat sys-apps/texinfo + virtual/os-headers " DOCS=( NEWS.md diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index ba8180abf1cc..f986923bb649 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,8 +1,8 @@ AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 -DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90 SHA512 c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0 +DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411 -EBUILD nagios-core-4.4.4.ebuild 6606 BLAKE2B 158f1629920032d07ccef39a5f6c8b596f894a957fae83b4efee89a42560f20eb4c2c248c0634ceac84b7315e1e0825a7608f1053a5485ab58d83b3b4dc33a44 SHA512 79985b40a69782d73780b5c0d85d758c96e57e87f24725d2bb338c8e761cadca4ac17e82d22a3662657408bb8cc1b03cc1e1eea2220424d75314f81fdccc6e75 +EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild deleted file mode 100644 index 74ddb853c43e..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs user - -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 perl +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 -# * mod_cgid -# * 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 -DEPEND="dev-libs/libltdl:0 - virtual/mailx - perl? ( dev-lang/perl:= ) - web? ( - app-arch/unzip - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd[php] ) - apache2? ( - || ( - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) - || ( - dev-lang/php:*[apache2] - dev-lang/php:*[cgi] - dev-lang/php:*[fpm] ) - ) - )" -RDEPEND="${DEPEND} - vim-syntax? ( app-vim/nagios-syntax )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -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 - 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 - - econf ${myconf} \ - --prefix=/usr \ - --bindir=/usr/sbin \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \ - --with-webdir=/usr/share/nagios/htdocs -} - -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) DESTDIR="${D}" 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 - - 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 - - newinitd startup/openrc-init nagios - - if use web ; then - if use apache2 ; then - # Install the Nagios configuration file for Apache. - insinto "/etc/apache2/modules.d" - doins "${FILESDIR}"/99_nagios4.conf - elif use lighttpd ; then - # Install the Nagios configuration file for Lighttpd. - insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios4.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 -} diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild new file mode 100644 index 000000000000..b6994129cefe --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs user + +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 perl +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 +# * mod_cgid +# * 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 +DEPEND="dev-libs/libltdl:0 + virtual/mailx + perl? ( dev-lang/perl:= ) + web? ( + app-arch/unzip + media-libs/gd[jpeg,png] + lighttpd? ( www-servers/lighttpd[php] ) + apache2? ( + || ( + >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] + >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] + >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) + || ( + dev-lang/php:*[apache2] + dev-lang/php:*[cgi] + dev-lang/php:*[fpm] ) + ) + )" +RDEPEND="${DEPEND} + vim-syntax? ( app-vim/nagios-syntax )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup nagios + enewuser nagios -1 -1 -1 nagios +} + +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 + 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 + + econf ${myconf} \ + --prefix=/usr \ + --bindir=/usr/sbin \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + --with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \ + --with-webdir=/usr/share/nagios/htdocs +} + +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) DESTDIR="${D}" 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 + + newinitd startup/openrc-init nagios + + if use web ; then + if use apache2 ; then + # Install the Nagios configuration file for Apache. + insinto "/etc/apache2/modules.d" + doins "${FILESDIR}"/99_nagios4.conf + elif use lighttpd ; then + # Install the Nagios configuration file for Lighttpd. + insinto /etc/lighttpd + newins "${FILESDIR}/lighttpd_nagios4.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-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest new file mode 100644 index 000000000000..5fddcc204780 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest @@ -0,0 +1,3 @@ +DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec +EBUILD nagios-plugins-linux-madrisan-25-r1.ebuild 1027 BLAKE2B efb8e3ad6283580d948b083c65984d9dffd338d7e2a2ee8be01b8bd2af578e8afbd457cf61fb61d27472a00519208bf3d9ddf2d6c05e5524f20d3d2b4801c6f7 SHA512 0d55a77d5cfa4d741c6388cf984b8eb376284f35d4f5979a7b326d446e2f48b16d411fdda8b1595b36e0283f1d9a0b13841a4f4824fbe0929cca096b45355766 +MISC metadata.xml 517 BLAKE2B b78b662d5028f2d3a6739be37b771af2ee51c35fa47b9aeff228dbcf67a8feaee45ea8db57acf2c6ac490b19ec87f97d0ba4db2883406945f5e37d30e430921e SHA512 b3a1dfedeb45883a101e1194643a6cfbc5041cf772f9ac70d32de38d909ef5aa5a1403b283e797c721b663498953d4b0810887a4c3e2ab51655084122b2e7ce3 diff --git a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml new file mode 100644 index 000000000000..2485783589cb --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml @@ -0,0 +1,15 @@ + + + + + sbraz@gentoo.org + Louis Sautier + + + Build check_docker which requires net-misc/curl + + + madrisan/nagios-plugins-linux + https://github.com/madrisan/nagios-plugins-linux/issues + + diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild new file mode 100644 index 000000000000..6367fdc2f4e7 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_PN="nagios-plugins-linux" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Additional and alternative Nagios plugins for Linux" +HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux" +SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl" + +DEPEND="curl? ( net-misc/curl:0= )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + # Avoid collision with net-analyzer/monitoring-plugins + # and net-analyzer/nagios-plugins + sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die + eautoreconf +} + +src_configure() { + local myconf=( + --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" + # Most options are already defaults for Gentoo + --disable-hardening + $(use_enable curl libcurl) + ) + econf "${myconf[@]}" +} + +src_test() { + emake check VERBOSE=1 +} diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 6c54935d0f2a..616dc578502e 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,4 +1,5 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 EBUILD nagios-plugins-2.2.1-r3.ebuild 3116 BLAKE2B d8d272c092af7fe6cab2c5f08f73e6a836e7862b98e65a42edb0125c87446504f89fa01d54663e7bd31da35bf45bfebd58b98ce137c4c6949ebc1e5b77932458 SHA512 9e59c607ff8177ddb930ad3e5cafd2ccf6dda76faa6b935532ecfae2c27ff696d4b7f5e8cca04164a98f3a1829c6ad969e41ac0a1fff3748f467df0387dfccc6 +EBUILD nagios-plugins-2.2.1-r4.ebuild 3102 BLAKE2B 71b4e4382bd6ad0d2278db3a21e952cf38e551bc8f3619297ff24f508c2ffe4a4261093135e950212c8b8dab80e2cac294fc07a91bf3e273a03a09ac47822307 SHA512 9d8af2f74fd41c3bd660f72dc66665b2436671d899df8e9f06c1691df963f549320dda0dada32a39fc6214af11285fc329415e8038f35d10e245ac15f416259a MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild new file mode 100644 index 000000000000..2c15df43c502 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="http://nagios-plugins.org/" +SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +# +# REAL_DEPEND contains the dependencies that are actually needed to +# build. DEPEND contains those plus the automagic dependencies. +# +REAL_DEPEND="dev-lang/perl + ldap? ( net-nds/openldap ) + mysql? ( dev-db/mysql-connector-c ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + radius? ( net-dialup/freeradius-client )" + +DEPEND="${REAL_DEPEND} + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Basically everything collides with nagios-plugins. +RDEPEND="${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +DOCS=( + ACKNOWLEDGEMENTS + AUTHORS + CODING + ChangeLog + FAQ + NEWS + README + REQUIREMENTS + SUPPORT + THANKS +) + +PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) + +src_prepare() { + default + + # Fix the path to our perl interpreter + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ + "${S}"/plugins-scripts/*.pl \ + || die 'failed to fix perl interpreter path' +} + +src_configure() { + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with ssl openssl /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered. Bug #468296. + myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) + fi + + econf \ + $(use_with mysql) \ + $(use_with ipv6) \ + $(use_with ldap) \ + $(use_with postgres pgsql /usr) \ + $(use_with radius) \ + "${myconf[@]}" \ + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" +} + +pkg_preinst() { + enewgroup nagios + enewuser nagios -1 -1 -1 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/Manifest b/net-analyzer/nagios/Manifest index a9ef6160cdaa..b777f77d646c 100644 --- a/net-analyzer/nagios/Manifest +++ b/net-analyzer/nagios/Manifest @@ -1,3 +1,3 @@ EBUILD nagios-4.3.4.ebuild 391 BLAKE2B 31a1586c68f74b862b0ee308ae8818c574a1e33f94a2b3daaa6d3a7d52622a61bcda61a5c968dcd911ad55ac03797dd0b54f85d4d98ebc79630fb0ed655c671e SHA512 80f20980638b39862e3026ff34e1a4827161366ad1c8079a32b8bd2736a67a3d4da2d042e9da54b6c0eef6dd2b3d196c7cdcb2949ac796d614e92fa9817cd85b -EBUILD nagios-4.4.4.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405 +EBUILD nagios-4.4.5.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1 diff --git a/net-analyzer/nagios/nagios-4.4.4.ebuild b/net-analyzer/nagios/nagios-4.4.4.ebuild deleted file mode 100644 index 39d47b09dafc..000000000000 --- a/net-analyzer/nagios/nagios-4.4.4.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="The Nagios metapackage" -HOMEPAGE="https://www.nagios.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND="~net-analyzer/nagios-core-${PV} - || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" diff --git a/net-analyzer/nagios/nagios-4.4.5.ebuild b/net-analyzer/nagios/nagios-4.4.5.ebuild new file mode 100644 index 000000000000..39d47b09dafc --- /dev/null +++ b/net-analyzer/nagios/nagios-4.4.5.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="The Nagios metapackage" +HOMEPAGE="https://www.nagios.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="~net-analyzer/nagios-core-${PV} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest index 779b8922bd3e..40b001f07d3b 100644 --- a/net-analyzer/ndoutils/Manifest +++ b/net-analyzer/ndoutils/Manifest @@ -3,5 +3,5 @@ AUX ndoutils-2.0.0-asprintf.patch 438 BLAKE2B 2d32a25467123281f8593b464362a66345 AUX openrc-init.patch 3296 BLAKE2B f07c1c0fda7a0d2e1c3f2b9cbae60568f743d82454179bcb3ee367d8a022a406dd1bf0c775fc9b339524cc5c64e4af6aacb8df8a866809104e39f39d11531f26 SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7 AUX sample-config-piddir.patch 1098 BLAKE2B 467fab110ef030010acf8e130d91ba1f97424c611ef75ed0a7806d5034f1c8a5ecce2c64832a295347fb3e323342f3afc5f5d1fbbc3584f26bd2f3b226cbf3af SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344 DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de -EBUILD ndoutils-2.1.3-r1.ebuild 2557 BLAKE2B 67519f051f59f2f0dee46914b65e8e0802af450d2a43285a28a81d9afa15bfc7f45ee85bdccffd60a9b19da35fff0f2e94099f17b466aeefe5900486c4405def SHA512 696abe6e261e729c9b252128e995c2b2bbbb01ac207f39a8ae7f0e1a5ce4edd6830ce8c065fe3b7954ffc8b16e04f4a5f44f8ed493b9808ab12dc3664601162f +EBUILD ndoutils-2.1.3-r2.ebuild 2572 BLAKE2B 29b9f5c3353bc3eb12622ab6bbacb5a62d398a7059c835be0a6e71d66e764188c46971236d96d92d141c7a1ad88a520c8fa0537cde9750fb5f4e8f6a9e467a3b SHA512 82ea4e98d2b97714cfef7155638b4eff269a220330eb9e97767880197f06843e9cdd8775f5df9637ea7d1bebe5eaaba41ba750661d2191d074e3cc266e497c5e MISC metadata.xml 446 BLAKE2B fa3dd9d02ff6fc6a6b973fc1a08e0402a7a024ee783d7d9eb86e6dbc5756ebf62942f87115e45997779fe9393d6a6df91f8a92ace9f6be38bbfda00b8951f06d SHA512 744e2dc2da0449a47d7acc67820a5627058f7e962f9b78beabc766936abb8a5a8c55d4bd01f239af9d63b418e36d875e30f591bf6ab694fc171c7387eb1c1c77 diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild deleted file mode 100644 index 018e14d53e39..000000000000 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit systemd - -DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" -HOMEPAGE="https://www.nagios.org/" -SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -# We require the "nagios" user from net-analyzer/nagios-core at build -# time. -DEPEND="dev-db/mysql-connector-c - dev-perl/DBD-mysql - dev-perl/DBI - >=net-analyzer/nagios-core-4" -RDEPEND="${DEPEND} - virtual/mysql" - -S="${WORKDIR}/${PN}-${P}" - -DOCS=( - Changelog - README - THANKS - TODO - UPGRADING - "docs/NDOUTILS DB Model.pdf" - "docs/NDOUtils Documentation.pdf" -) - -PATCHES=( - "${FILESDIR}/format-security.patch" - "${FILESDIR}/ndoutils-2.0.0-asprintf.patch" - "${FILESDIR}/sample-config-piddir.patch" - "${FILESDIR}/openrc-init.patch" -) - -src_configure() { - # The localstatedir is where our socket will be created by the - # nagios daemon, so we put it in /var/nagios where the "nagios" user - # will be able to write. - # - # And normally, we would use /run for the pid file, but the daemon - # drops permissions before creating it, the the piddir also needs - # to be writable by the nagios user. - econf --enable-mysql \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --with-piddir=/var/nagios -} - -src_compile() { - # Avoid "emake all" so that we don't build the stuff for nagios-2.x - # and nagios-3.x, some of which throws QA warnings. We don't use it - # anyway. - pushd src - emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug - popd -} - -src_install() { - default - insinto /etc/nagios - newins config/ndo2db.cfg-sample ndo2db.cfg - newins config/ndomod.cfg-sample ndomod.cfg - newinitd "startup/openrc-init" ndo2db - newconfd "startup/openrc-conf" ndo2db - systemd_newunit "startup/default-service" "${PN}.service" - - # The documentation isn't installed by the build system - dodoc -r docs/html - - insinto "/usr/share/${PN}" - doins -r db - - # These need to be executable... - exeinto "/usr/share/${PN}/db" - doexe db/{installdb,prepsql,upgradedb} - - # Use symlinks because the installdb/upgradedb scripts use relative - # paths to the SQL queries. - dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb - dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb -} - -pkg_postinst() { - elog "To include NDO in your Nagios setup, you'll need to activate" - elog "the NDO broker module in /etc/nagios/nagios.cfg:" - elog " broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg" -} diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild new file mode 100644 index 000000000000..784309fee43a --- /dev/null +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit systemd + +DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" +HOMEPAGE="https://www.nagios.org/" +SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +# We require the "nagios" user from net-analyzer/nagios-core at build +# time. +DEPEND="dev-db/mysql-connector-c + dev-perl/DBD-mysql + dev-perl/DBI + >=net-analyzer/nagios-core-4.4.5" +RDEPEND="${DEPEND} + virtual/mysql" + +S="${WORKDIR}/${PN}-${P}" + +DOCS=( + Changelog + README + THANKS + TODO + UPGRADING + "docs/NDOUTILS DB Model.pdf" + "docs/NDOUtils Documentation.pdf" +) + +PATCHES=( + "${FILESDIR}/format-security.patch" + "${FILESDIR}/ndoutils-2.0.0-asprintf.patch" + "${FILESDIR}/sample-config-piddir.patch" + "${FILESDIR}/openrc-init.patch" +) + +src_configure() { + # The localstatedir is where our socket will be created by the + # nagios daemon, so we put it in /var/lib/nagios where the "nagios" + # user will be able to write. + # + # And normally, we would use /run for the pid file, but the daemon + # drops permissions before creating it, so the piddir also needs + # to be writable by the nagios user. + econf --enable-mysql \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --with-piddir=/var/lib/nagios +} + +src_compile() { + # Avoid "emake all" so that we don't build the stuff for nagios-2.x + # and nagios-3.x, some of which throws QA warnings. We don't use it + # anyway. + pushd src + emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug + popd +} + +src_install() { + default + insinto /etc/nagios + newins config/ndo2db.cfg-sample ndo2db.cfg + newins config/ndomod.cfg-sample ndomod.cfg + newinitd "startup/openrc-init" ndo2db + newconfd "startup/openrc-conf" ndo2db + systemd_newunit "startup/default-service" "${PN}.service" + + # The documentation isn't installed by the build system + dodoc -r docs/html + + insinto "/usr/share/${PN}" + doins -r db + + # These need to be executable... + exeinto "/usr/share/${PN}/db" + doexe db/{installdb,prepsql,upgradedb} + + # Use symlinks because the installdb/upgradedb scripts use relative + # paths to the SQL queries. + dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb + dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb +} + +pkg_postinst() { + elog "To include NDO in your Nagios setup, you'll need to activate" + elog "the NDO broker module in /etc/nagios/nagios.cfg:" + elog " broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg" +} diff --git a/net-analyzer/ndsad/Manifest b/net-analyzer/ndsad/Manifest index 10a8743e3daf..5cf6d60ba204 100644 --- a/net-analyzer/ndsad/Manifest +++ b/net-analyzer/ndsad/Manifest @@ -7,4 +7,5 @@ AUX ndsad.conf.d 286 BLAKE2B 1cb53d5a324ef0aa5e4535299815427d74177d911f517b9d51a AUX ndsad.init 675 BLAKE2B 3b6eff620021d8be3ab938c8e17adda4488214657e0d80884285cddd702167ad2817ae2df46014962aec6556f2f67af0ed4442c6cf29492ad94bad760833e595 SHA512 f08c02ea457e2067e170cea8c2860ac12ccbbc4dd50a27f308e7b6884afa7e2ca8a7cf2f2d627002c43c13c4bc710727579fd22e043105d1c3f135de9cfdb500 DIST ndsad-1.33.tgz 214614 BLAKE2B ca8e0f983d14cb43148411cead699dc140ca0cce60266b0aae6cb1836c643bd5c5d7aae6c34ae372af83a20e0e9ab39f92fcc46f2e2edbc70cf3968ee9b824dd SHA512 38ebca91f28d763ce334d92361779f100ee6b98d6d17485bf096f913f777e8525add63bd73aeea43321cee622e10cb88020aca7af492fbafdd50cf740510bd51 EBUILD ndsad-1.33-r1.ebuild 905 BLAKE2B 540ba5fb53cab1fc45a88831eca7e222882049904c08dd77743c7ccb54065a75ac628b15be67f6376bb9f76f83b7682067776445ccb2b1b6659bbe394094d3d4 SHA512 4fd73c4234e8e08284e2c21501315203feb814d6ce73c4140a9e5f71772f3a2fcdd119f682bce8917ec048876c205db1a6a91c2e56d7794ffb8c09680078adcc +EBUILD ndsad-1.33-r2.ebuild 854 BLAKE2B 06458be1e1c5665868c257766cdad06a1feca486ceeb3e40f6deb0a53ca01cfdfea99583adac0b122800fcbb76959b644d52817dcc1120bc49837dbc93a04283 SHA512 20be2483348444283a262667b7dce91298af0009e426fbf256c91b6489caf11215ecf6f4f500ad5ccc33311c7d7492c6c7a40874731bce19cd2690e3ac3d9562 MISC metadata.xml 1271 BLAKE2B ae2d1adc298d9987342838550ed7fe1081b88198b7a6f24825a78356db0833013429acdeb6836c4e7f90cf1bb9e2961cc52dded5d2857d6baac2a3f00f5ab0bd SHA512 9db4f4368820e30e5b48f1ad9c49e245348c57a37829aec25b699d863e5e56f565f52c948cb6a2b63efd4c54c4feff204234e2d98bb8525f767d55701d14ce3f diff --git a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild new file mode 100644 index 000000000000..e7f9a919a4a4 --- /dev/null +++ b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources" +HOMEPAGE="https://sourceforge.net/projects/ndsad" +SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +DEPEND=" + >=net-libs/libpcap-0.8 +" +RDEPEND=" + ${DEPEND} +" +PATCHES=( + "${FILESDIR}"/${P}-conf_path.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-getpid.patch + "${FILESDIR}"/${P}-log-path.patch + "${FILESDIR}"/${P}-strncpy-overflow.patch +) +DOCS=( ChangeLog AUTHORS README ) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + doman ndsad.conf.5 + + insinto /etc + newins ndsad.conf ndsad.conf + + newinitd "${FILESDIR}"/ndsad.init ndsad + newconfd "${FILESDIR}"/ndsad.conf.d ndsad +} diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index f164c3c4e831..0e82b21577b4 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1,6 +1,8 @@ AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718 DIST NessusAgent-7.4.0-es7.x86_64.rpm 15719960 BLAKE2B 3ea992c54d7a5acf09bc0097b6780993daab68ef2ac4816b247dba8deb949f5fd3202f9244d8ca6d9b53414163deb942b4e2739e14b42396a9a64b2265dea18e SHA512 35d948807a5110a3b1e32abf8a427aebbf082555ffd7f11abff037909119eed8f866f09121d2523107a6b2c374a45f0ff42933b1148d7679436540956d227c4b DIST NessusAgent-7.4.1-es7.x86_64.rpm 15719896 BLAKE2B 16e0c578c01edeb54156e6228569ad3c179ac421887dc5f844aa957ef0c12f69d72a22efd8f0fecec9d3d23dcd8a9fdc017561f05f1aaf1cc3a426f83b9b914d SHA512 ff3704706d740e70cac083eb748e9e0e410709b8718c7fd77851ee7591fd5cb0c162bc7308662f864cd1d527ae33171c089d0b32e88c278399aaf8d95d013c22 +DIST NessusAgent-7.4.2-es7.x86_64.rpm 15989044 BLAKE2B 7fdc998acc4a5ee38519a3cf4d41d1de29cb8ddacb05bd6f734a458c63d7ce22c547b4d080320631d489dc381c4553d99a81786dcb48231833a77561ffa6928f SHA512 4aacc51d360c41963ad46c0976322cd29012d52e054337d4e0a303257796923bd35059324a041827ce0c54ef5c5dd6738311fcc4f0bcba19b6d4ea1e3730a146 EBUILD nessus-agent-bin-7.4.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684 EBUILD nessus-agent-bin-7.4.1.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684 +EBUILD nessus-agent-bin-7.4.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348 diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild new file mode 100644 index 000000000000..20d896ea6290 --- /dev/null +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit rpm pax-utils systemd + +MY_P="NessusAgent-${PV}-es7" + +DESCRIPTION="A remote security scanner for Linux - agent component" +HOMEPAGE="https://www.tenable.com/" +SRC_URI="${MY_P}.x86_64.rpm" + +LICENSE="GPL-2 Nessus-EULA" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="mirror fetch strip" + +QA_PREBUILT="opt/nessus_agent/bin/nasl + opt/nessus_agent/bin/nessus-mkrand + opt/nessus_agent/lib/nessus/libjemalloc.so.${PV} + opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so + opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc + opt/nessus_agent/sbin/nessus-check-signature + opt/nessus_agent/sbin/nessus-service + opt/nessus_agent/sbin/nessuscli + opt/nessus_agent/sbin/nessusd" + +S="${WORKDIR}" + +pkg_nofetch() { + einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" + einfo "The archive should then be placed into your DISTDIR directory." +} + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus_agent/com/nessus/CA + keepdir /opt/nessus_agent/etc/nessus + keepdir /opt/nessus_agent/var/nessus/logs + keepdir /opt/nessus_agent/var/nessus/tmp + keepdir /opt/nessus_agent/var/nessus/users + + newinitd "${FILESDIR}"/nessusagent.initd nessusagent + systemd_dounit usr/lib/systemd/system/nessusagent.service +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," + elog "obtain an appropriate linking key and run" + elog "" + elog " /opt/nessus_agent/sbin/nessuscli agent link --key= --host= --port= [optional parameters]" + elog "" + elog "This can be done before the agent is started." + fi +} diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index b1b879a92247..df29868ad6f4 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,7 +1,6 @@ AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75 AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415 -AUX net-snmp-5.7.3-mariadb-10.2.patch 1292 BLAKE2B 6b445dd00096924b975327c948c20942be70c1797605c9af22ca0395c06d1e4129170254a4d6b1f03948c18ef5d0e88250490a601df67736fafca973f0a1f042 SHA512 43b8d39837af147edf66b322d8e75bc82acc243f9eb6bb7ab11ed2975442ee975292d61d953d862679027d5110198ee30347de6209feb2abf3a6ede8547c0de1 -AUX net-snmp-5.7.3-perl524-2.patch 1776 BLAKE2B fdf872595094d83300ed950731b470db87b4cbf1eb584a109000d9af5fd329225d1d16f0509c6eabe6dae5602583f90dec7945596d912fb6137638a30d94e994 SHA512 ddd2ac301995114ea70890d89a320528e9009d9f49203ab9fa247b507e16dfa91cb517dd408290c530c1e0ca07f6ee431015958a625d68dd082d4c1e55d279ae +AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff @@ -9,15 +8,9 @@ AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba1 AUX snmptrapd.conf 517 BLAKE2B dced765351c6fbd74166da9c3631993a06135569e8bc7b2375e36e2823446de47c82e10992579a05bdd1f2803fc4694463f0f9e1e5e3510204a28184919d8a78 SHA512 283d1503ebca55046cc273f693a257be3e8e6f26b5db10a3b64a5455079a41568eb40c1a3f5dbc698b822502d5e8120ea80b9e2c3ac4aa1d830d318228c0beca AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf9252404b49f8c58355b4def5d751df0b3c7878bcce0bf703ccb7ba022db108eb1496b68eb2bb4a035612da SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d -DIST net-snmp-5.7.3-patches-2.tar.xz 3312 BLAKE2B 9cf2b3b5ec2f65dc8c017565666c148acb42354f8a03274f67c856fea530df27877026aa2c0477d90cd2f035503e15cd48c33b449a9522c34c9dca370f7ed7a6 SHA512 22ca6cc4dd1fd58a8cff53881d248155dbfdab765e9a3664320c8c4a5cfa35e741adfb0304bb38be7719ba1c7418f9b0f9178719951b82d70257c3c944c450ad DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 -DIST net-snmp-5.7.3-perl524-2.patch.gz 523 BLAKE2B 6762795cd6bcdccd5b49899cf572d5a498f3ab7fd20af69fad5f3fe45880e40f2aecfb0e9443a2a10773e25323ed5d0f271446d8fc03102e70fa8efd79e0d118 SHA512 bede47234b809d67f33c46654f3d09d0b255d835fb97eea23bfa888922dfb80ad287c305596a6b041ed03ec91dc7c647ecd54c3c79e0b4ce08978332de3cc007 -DIST net-snmp-5.7.3-perl524.patch.gz 9072 BLAKE2B d870e195bccb8178827791c9bd495d5c13a8848d176ae72b1c6b54b38eabc3b5aa4842d1841f422e3a71d9e9129b2acf303e8961ce98f82f5d9310c3a65e671d SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4 -DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582bc8da765e212285478ffb16c8725ddecd37842aba7835bc90ea74437ce00491dff569b1ce2c7499acf46968b3935 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 -EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a -EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa -EBUILD net-snmp-5.7.3_p3-r1.ebuild 5235 BLAKE2B 20975c562ad43c1a20d4116aa2d422285adbad4df23f7f975357668fbbed6951705fffcec1008498374c42f14ecc6dc96e471970fba95cc592b862019bf23c18 SHA512 c058c0f7351da016936c454830887510a204bc9ae7d798f81323a4a4228fa51ad52551a68e95125c88ed2f511b3d0ee6860cd09bce70ae9d8719ad9673e3f9cd EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 08450602568f2b2854cb62c123709035259cf71435911fa34f9ba7aa512755d8a911373d831ec7645f1829c42281444da4bc85c6f30f7da1e2082290d0e3b572 SHA512 8d870aa51ac3d5d65dfef6e94ca38fe154d689c011d494e1a931852b34ddc17a5fb3382ba1637b3f7bffd6bf8e79c52a75a25a675c7b9b8a41ad1c8a8151f848 +EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 495325377ce6ef83dbc4ad6b4ffae809ecc9e99ac5908a1a001c87ad275fe556cacc3866d0a2d712b49a9ae8c5d1fe11a70355cb457e4c9571b0448c02e2ee47 SHA512 9474859c802d792503a6d4235eac511de6210648092acf071f938e928675fb1cb560e33a78b34d1cebfde7098464c7df992fb78c67646c58d8a52bfa065bc671 EBUILD net-snmp-99999999.ebuild 5227 BLAKE2B 30ce2a65e1628ce78759589124604cd9db583c05edfc7cd8c1ab05d31fec7368271eaa073dff921304849e835608f0e63d58c0775b85bd69d391a259b9d3d1a9 SHA512 9690b14e47ecb2e9e5d8f6d32a6e9c429b3c5561975f0045e82fa9616afaae1f892099f789243eb68fcb522e0318b19782bf82fbc848356c93aa97b3fd5ba47c MISC metadata.xml 1193 BLAKE2B b53ad11776e58b025bb3655b4f3bb96580f0dbde557cfa037e272ab6e71411b4bec434a82df646da3f3b53e1eda24555cf26366084c27d8729ec0342249a5c93 SHA512 4b9d6d7d36786dd2176f0d90bc4f55f310595807d4a364132c098df60de2c0bab6e8619760de768667e1c13bbcf5d209a73469e06bd1d78323bea76ae4fdf981 diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch deleted file mode 100644 index dea1a0178531..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -54,6 +54,7 @@ - #include - #include - #include -+#include - - netsnmp_feature_require(container_fifo) - -@@ -437,6 +438,7 @@ netsnmp_mysql_init(void) - return -1; - } - -+#if MYSQL_VERSION_ID < 100000 - #ifdef HAVE_BROKEN_LIBMYSQLCLIENT - my_init(); - #else -@@ -445,6 +447,7 @@ netsnmp_mysql_init(void) - - /** load .my.cnf values */ - load_defaults ("my", _sql.groups, ¬_argc, ¬_argv); -+#endif - for(i=0; i < not_argc; ++i) { - if (NULL == not_argv[i]) - continue; -@@ -542,6 +545,10 @@ netsnmp_mysql_init(void) - return -1; - } - -+#if MYSQL_VERSION_ID > 100000 -+ mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd"); -+#endif -+ - /** try to connect; we'll try again later if we fail */ - (void) netsnmp_mysql_connect(); - ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -50,11 +50,16 @@ - #undef PACKAGE_STRING - #undef PACKAGE_TARNAME - #undef PACKAGE_VERSION -+#ifdef HAVE_BROKEN_LIBMYSQLCLIENT -+#include -+#include -+#else - #include - #include - #include - #include - #include -+#endif - - netsnmp_feature_require(container_fifo) - diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch deleted file mode 100644 index 45855597a867..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/perl/ASN/Makefile.PL -+++ b/perl/ASN/Makefile.PL -@@ -1,3 +1,4 @@ -+package ASN; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/AnyData_SNMP/Makefile.PL -+++ b/perl/AnyData_SNMP/Makefile.PL -@@ -1,3 +1,4 @@ -+package AnyData_SNMP; - use ExtUtils::MakeMaker; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. ---- a/perl/OID/Makefile.PL -+++ b/perl/OID/Makefile.PL -@@ -1,3 +1,4 @@ -+package OID; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - ---- a/perl/SNMP/Makefile.PL -+++ b/perl/SNMP/Makefile.PL -@@ -1,3 +1,4 @@ -+package SNMP; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/TrapReceiver/Makefile.PL -+++ b/perl/TrapReceiver/Makefile.PL -@@ -1,3 +1,4 @@ -+package TrapReceiver; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/agent/Makefile.PL -+++ b/perl/agent/Makefile.PL -@@ -1,3 +1,4 @@ -+package agent; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/agent/Support/Makefile.PL -+++ b/perl/agent/Support/Makefile.PL -@@ -1,3 +1,4 @@ -+package agent_Support; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/agent/default_store/Makefile.PL -+++ b/perl/agent/default_store/Makefile.PL -@@ -1,3 +1,4 @@ -+package agent_default_store; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/default_store/Makefile.PL -+++ b/perl/default_store/Makefile.PL -@@ -1,3 +1,4 @@ -+package default_store; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/manager/Makefile.PL -+++ b/perl/manager/Makefile.PL -@@ -1,3 +1,4 @@ -+package manager; - use ExtUtils::MakeMaker; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch new file mode 100644 index 000000000000..72127d053c0a --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch @@ -0,0 +1,23 @@ +commit 9f4af8c42d515e6b214738cc97212dfbe7f749cf +Author: Andreas Hasenack +Date: Tue Feb 5 18:21:40 2019 -0800 + + apps/snmptrapd_sql: Fix build against MySQL 8 + + See also https://sourceforge.net/p/net-snmp/bugs/2922/. + + [bvanassche: changed 'int' into 'char'] + +diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c +index 6126ca916..32a3b1799 100644 +--- a/apps/snmptrapd_sql.c ++++ b/apps/snmptrapd_sql.c +@@ -199,7 +199,7 @@ typedef struct sql_buf_t { + * static bind structures, plus 2 static buffers to bind to. + */ + static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX]; +-static my_bool _no_v3; ++static char _no_v3; + + static void _sql_process_queue(u_int dontcare, void *meeither); + diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild deleted file mode 100644 index 8d923fa28d7b..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=2 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://net-snmp.sourceforge.net/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" - -COMMON_DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - bzip2? ( app-arch/bzip2 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - elf? ( dev-libs/elfutils ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( virtual/mysql ) - perl? ( dev-lang/perl:= ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - epatch "${WORKDIR}"/${P}-perl524.patch - epatch "${WORKDIR}"/${P}-perl524-2.patch - epatch "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - - epatch "${WORKDIR}"/patches/*.patch - - epatch_user - - 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 mysql) \ - $(use_with netlink nl) \ - $(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 --disable-static \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --with-ldflags="${LDFLAGS}" \ - --with-logfile="/var/log/net-snmpd.log" \ - --with-mib-modules="${mibs}" \ - --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ - --with-sys-location="Unknown" -} - -src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} - done - - use doc && emake docsdox -} - -src_install () { - # bug #317965 - emake -j1 DESTDIR="${D}" install - - 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 - - use doc && dohtml docs/html/* - - 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 -} diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild deleted file mode 100644 index 060479915394..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=2 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://net-snmp.sourceforge.net/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" - -COMMON_DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - bzip2? ( app-arch/bzip2 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - elf? ( dev-libs/elfutils ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( virtual/mysql ) - perl? ( dev-lang/perl:= ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - epatch "${WORKDIR}"/${P}-perl524.patch - epatch "${WORKDIR}"/${P}-perl524-2.patch - epatch "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - - epatch "${WORKDIR}"/patches/*.patch - - epatch_user - - 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 mysql) \ - $(use_with netlink nl) \ - $(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 --disable-static \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --with-ldflags="${LDFLAGS}" \ - --with-logfile="/var/log/net-snmpd.log" \ - --with-mib-modules="${mibs}" \ - --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ - --with-sys-location="Unknown" -} - -src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} - done - - use doc && emake docsdox -} - -src_install () { - # bug #317965 - emake -j1 DESTDIR="${D}" install - - 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 - - use doc && dohtml docs/html/* - - 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 - - prune_libtool_files -} diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild deleted file mode 100644 index 4add1e5486bb..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://net-snmp.sourceforge.net/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PV/*_p/}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P/_p*/}-perl524.patch.gz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" - -COMMON_DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - bzip2? ( app-arch/bzip2 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - elf? ( dev-libs/elfutils ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( dev-db/mysql-connector-c:0= ) - perl? ( dev-lang/perl:= ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" -S=${WORKDIR}/${P/_p*/} - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - eapply "${WORKDIR}"/${PN}-5.7.3-perl524.patch - eapply "${FILESDIR}"/${PN}-5.7.3-perl524-2.patch - eapply "${FILESDIR}"/${PN}-5.7.3-mariadb-10.2.patch - eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - - eapply "${WORKDIR}"/patches/*.patch - - eapply_user - - 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 mysql) \ - $(use_with netlink nl) \ - $(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 --disable-static \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --with-ldflags="${LDFLAGS}" \ - --with-logfile="/var/log/net-snmpd.log" \ - --with-mib-modules="${mibs}" \ - --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ - --with-sys-location="Unknown" -} - -src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} - done - - use doc && emake docsdox -} - -src_install () { - # bug #317965 - emake -j1 DESTDIR="${D}" install - - 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 - - prune_libtool_files -} diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild new file mode 100644 index 000000000000..2452860409a7 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=yesplz +DISTUTILS_OPTIONAL=yesplz +WANT_AUTOMAKE=none +PATCHSET=3 +GENTOO_DEPEND_ON_PERL=no + +inherit autotools distutils-r1 eutils perl-module systemd + +DESCRIPTION="Software for generating and retrieving SNMP data" +HOMEPAGE="http://www.net-snmp.org/" +SRC_URI=" + mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz + https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz +" + +S=${WORKDIR}/${P/_/.} + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0/35" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" + +COMMON_DEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) + libressl? ( dev-libs/libressl:= ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + bzip2? ( app-arch/bzip2 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) + elf? ( dev-libs/elfutils ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + pci? ( sys-apps/pciutils ) + lm_sensors? ( sys-apps/lm_sensors ) + netlink? ( dev-libs/libnl:3 ) + mysql? ( dev-db/mysql-connector-c:0= ) + perl? ( dev-lang/perl:= ) +" +DEPEND=" + ${COMMON_DEPEND} + doc? ( app-doc/doxygen ) +" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/Tk ) + !minimal? ( dev-perl/TermReadKey ) + ) + selinux? ( sec-policy/selinux-snmp ) +" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" +S=${WORKDIR}/${P/_p*/} + +RESTRICT=test + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch + eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch + eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch + + mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + eapply "${WORKDIR}"/patches/*.patch + + eapply_user + + 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 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 --disable-static \ + --with-default-snmp-version="3" \ + --with-install-prefix="${D}" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@Unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + for target in snmplib agent sedscript all; do + emake OTHERLDFLAGS="${LDFLAGS}" ${target} + done + + use doc && emake docsdox +} + +src_install () { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + 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 + + prune_libtool_files +} diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 5119f4160bf8..8783b6eedd96 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -3,6 +3,7 @@ DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc7 DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7c95d5605a3fe73616af955b50036d2db7729494e8cc08d95a0bd11fb0259abb50d5f4da979f977b734778b16678 SHA512 132e8c0c57798d69ca8c3f360c2d55f1b8a46deaeacbb59979bc5bb5c52c9eaf02db7f7a166848787aae5807122d86f48fa86c0b9211ed0fdfd92889d1d8e2e4 DIST netdata-1.16.1.tar.gz 3286225 BLAKE2B 4411baa2da9282173abef872dce02bc0a3f1b1e46a449648a0e09f35db27f2864bc63caf155f84e550ea8cff60c0c0d887a9e7043ac138a45a8170805059fed5 SHA512 f16dad4395b3cd2c437e03f98a2e0945fabd1cabd8b0f294d83e2fbd429955fe1cbe92668f9d3160d1c56ea744acc3908c8df91d0b3bb0623854361878317520 +DIST netdata-1.17.0.tar.gz 3313545 BLAKE2B 4225ed7e53d9d79d4e0e5e6c4c5408a78bcb1ce05a5d20925c231d55131e13ef3426586962c85f814073fad389495ac010b6843288865a44d8a0f22e55eab065 SHA512 fb1a2295868df3a161cc777dddece3bd8c6a2338a75ba72d6eaa7ca6914a1661cb056680229ad67d3059081309130f60eeff98d8e60ab3a03622f5c1947d1b08 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96 @@ -11,5 +12,6 @@ EBUILD netdata-1.15.0-r2.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5 EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd EBUILD netdata-1.16.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992 EBUILD netdata-1.16.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992 +EBUILD netdata-1.17.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992 EBUILD netdata-9999.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3 diff --git a/net-analyzer/netdata/netdata-1.17.0.ebuild b/net-analyzer/netdata/netdata-1.17.0.ebuild new file mode 100644 index 000000000000..b12cc034edfb --- /dev/null +++ b/net-analyzer/netdata/netdata-1.17.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) + +inherit autotools fcaps linux-info python-r1 systemd user + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-analyzer/tcpdump + net-analyzer/traceroute + net-misc/curl + net-misc/wget + sys-apps/util-linux + virtual/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + dev-libs/libuv + app-arch/lz4 + dev-libs/judy + dev-libs/openssl:= + ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl + ) + nodejs? ( net-libs/nodejs ) + python? ( + ${PYTHON_DEPS} + dev-python/pyyaml[${PYTHON_USEDEP}] + mysql? ( + || ( + dev-python/mysqlclient[${PYTHON_USEDEP}] + dev-python/mysql-python[${PYTHON_USEDEP}] + ) + ) + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + tor? ( net-libs/stem[${PYTHON_USEDEP}] ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +: ${NETDATA_USER:=netdata} +: ${NETDATA_GROUP:=netdata} + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' +) + +pkg_setup() { + linux-info_pkg_setup + + enewgroup ${PN} + enewuser ${PN} -1 -1 / ${PN} +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=${NETDATA_USER} \ + --disable-jsonc \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_install() { + default + + rm -rf "${D}/var/cache" || die + + # Remove unneeded .keep files + find "${ED}" -name ".keep" -delete || die + + fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata + keepdir /var/log/netdata + fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + + fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN} + + newinitd system/netdata-openrc ${PN} + systemd_dounit system/netdata.service + insinto /etc/netdata + doins system/netdata.conf + + echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata + doenvd 99netdata +} diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest index f9bbc5421809..12d0326743e7 100644 --- a/net-analyzer/nethogs/Manifest +++ b/net-analyzer/nethogs/Manifest @@ -1,5 +1,3 @@ -DIST nethogs-0.8.1.tar.gz 35986 BLAKE2B a357c4a28478ecd5497c44e31a2a994baa074a027f3b3a11919cbe83b0b5bda426594e5a85046c82f0e0742ef4827cd151a1b8511eeecb556a851f5432b62271 SHA512 f1af7bb7208d08fc3a51bb38ee475da5a7b8f8814e2a7a653057d0c5d6b4e73be7742ffef5569525822160971f81dd22212d6854483928e621cfddce8d98409f DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908 -EBUILD nethogs-0.8.1.ebuild 679 BLAKE2B 46d88f3418e4943c042b016882041268b68f35a13ba3c15ebc4b053ac0c301acd5053e167cd378342d3434033d4ee9da8ad8aa548f257ac183cb0efb28bc6ddf SHA512 76fa00e33e4055259e67843469bdee9433c3d0499e1301b3962e1a2c55417d671eac99c8c08c54671c468e4da58c5faabb8e2461f9b179dac7b20011dff03368 EBUILD nethogs-0.8.5-r1.ebuild 687 BLAKE2B 3327b3f3cd5c122d19d03290c475083767614e092a3a83db48d45b2af83930e7b835029165427002ccdc74b383fb40e6d8c7fd853c59c06eec81a7eb8e709ab1 SHA512 2cb80a6c06355bded0292b1a30d60d681e4b4fd7a624eabb38bc9b3ac8308e8c84af20e9a401164bae66a98fa5ad821a86ff0faee6188255cb9586ae0f42c20f MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed diff --git a/net-analyzer/nethogs/nethogs-0.8.1.ebuild b/net-analyzer/nethogs/nethogs-0.8.1.ebuild deleted file mode 100644 index 8a31eb5993fc..000000000000 --- a/net-analyzer/nethogs/nethogs-0.8.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="A small 'net top' tool, grouping bandwidth by process" -HOMEPAGE="https://github.com/raboof/nethogs" -SRC_URI="${HOMEPAGE}/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:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_compile() { - tc-export CC CXX - emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" -} - -src_install() { - emake DESTDIR="${D}" prefix="/usr" install - dodoc Changelog DESIGN README.decpcap.txt README.md -} diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest index 6d2b9c920f46..05f6d66c164c 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -1,15 +1,8 @@ -AUX nrpe-2.14-multiline.patch 6806 BLAKE2B 601bfaf6a7deddcd59c7ab9666ea9ada85698326d8f1eb0971196167edc79cad8acc818b6faa5e53cdad608692e9d3438200a08f2641bdac9937692cf83b8702 SHA512 09c0cc6a4610d674b0ed0da8cdc96f3653f98b54fc98802c33a1cc0b09755d3d0d6afd7fe6b25e1713e6b27af2ba1fa5063988691bc3b5364fa0bfd137d54546 -AUX nrpe-2.15-autoconf-header.patch 898 BLAKE2B 4cec3a40431057025c8aa711ea0535885c1b115f19f127a5d65145c2efb1215524bab357812d8648c32d953307e16ffbf5b787a306a7cd5941d957a33bda7eb4 SHA512 aa7aa0cb57c1b9826a980f9e093f8c8219e0b02dd1e8ba27e74a0a39e746d723e280a93d18d4e069743d14937e0c7159336bb6f406671450fc6a0bb90f902fb2 -AUX nrpe-2.15-metachar-security-fix.patch 1165 BLAKE2B f7e4c7c7ac83627baeb87b05264cea254cc852a4bcf1e67fb7994c3e15605ebafa6b25819692d179e23c2f8fca729c52f49ec47f979ba63574a26d9cb03ba2ae SHA512 cba997f4433dd38c95a3e2166f091b53ac6f618f25944dc69bb9ae5864a74a1136667c557881a498ce6aa16e91b367c416a5935e20e348f94f140fdc09692b29 -AUX nrpe-2.15-no-ssl.patch 967 BLAKE2B e198d1c140ba6cdcc50739e79ffd955c9f5ca692e529a09cfcc31db991d229df85a7137c0a72747e881aff82aa16d3b08cd5f12e0dbda2ad2c2a2793ceef05bd SHA512 17163aa22fd9e03ca00679756413c9ac2051b2d66c894b3ec6dc6bad468d2835c95481eab915b40ccc37e7063e1a2b382af7ed47a5c2ea6d1aa94286a95c44ce -AUX nrpe-2.15-tcpd-et-al.patch 2651 BLAKE2B 2ada9c800d41a9854102f5a469c9ec829212845e07c3d17aaed095f90e807acfe945b3eaac6cf5d51fedd25d3baa88cefb75e72476a84c105a706560b0512abf SHA512 d4c2b38f05b9ac19702ff81d0f07cabed9f98a309e0e4d287bd9784b0aa6ee50ff8b6aee0f4d5541cb10120d463b470d23a6d4a4a2627166d6cf1b07fb5d61de AUX nrpe-3.2.1-eliminate-systemd-pid.patch 1264 BLAKE2B e0fb75dcc231881fd02fba73de02b983098d7762852d5dea497e717e0c978d773c871d35ba8671a4d292896aa276703ea9d2450e053add1ff3f2d6d9f1c53bf1 SHA512 9e8d58dee6c60b48e209a69eaab10abcc5eccfc28edf073240afba3d3e70a36ead4a568fe6589dd8578d11f0149c968c5977742e9905fa0a407b120c6d168570 AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f61534a58563eaed379f1296df5eaf68aab88440f4199354118ffbcc5b4340eda633bb3eb49092c SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb -DIST nrpe-2.15.tar.gz 419695 BLAKE2B 999ecc633cbd2dc516ff0654db3ac0cc58a88d93ae4ace1040888fe73d8fb471306d95312ac364c79b3a47300ac57c0c429a24697c37bfa639f1da55cb6bc756 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73 DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 -EBUILD nrpe-2.15-r3.ebuild 4013 BLAKE2B 6609597c36f1df0228f627a66f1a2edaf2c30c93d3f143c69ab92c2c914f1e83bbb3bfd2bdd286fdc42411b3d86ca9716609f278838849ed940aa35dc7cad9c0 SHA512 d2442384f0bea253479f06186b78f013514f6fbaddc1aea531eec6b7f0436061aab3852d4035bd61fcaa6beefa2f2724200d8845d62851ced816895aa9258179 EBUILD nrpe-3.2.1-r1.ebuild 2486 BLAKE2B a71330ceb27dba3654f6e4923ef4e395e6f831bd2fafe23220e39cdf31aa9d3a898bec0b4ceca4a4a7fee73c76efb69207b4ddb7b264a6af4c0aae84fa2cbc19 SHA512 71e4bf9e5a6ad3f1ff1315d09b84d56b2b5772d7f0627f09c60fa6f63c81ebf1bc89e2980085efb0a9d9a54b8d98846010b5f26c66bfb863f2421cef2c6b0e79 -EBUILD nrpe-3.2.1.ebuild 1938 BLAKE2B bd00244a5585503b24b108f167345560d0b7855a8cdd1497fc4e853b86b42e4f9fb67aa1fc767ca67f5e3b1e13424828f295b0a74316c95a17ebb26dbea7aa0f SHA512 f0fa9659e5c06ad4239ede15ac5303675812db6cd06febade51c68aaa05e289ad1f206e53f78c327e918955be4e69e07b621671110044b3f1fc1d161ee36ee64 -MISC metadata.xml 882 BLAKE2B 76bf034c9869b503725f301f0f478c0449787057f1ba4bc22842ddee2d4460b68be1654cdc18e04504469880b71113e7a4b5a0a37fc9138eeb1b39fc2c8833f1 SHA512 2bbdd6bb5d0802985b242b8c058c749eca1adfb102820e2c587699622299936df90ee1ff43445df8686e1dd1648d0131bee40639ddfad3e26e9877c0c61dc40e +EBUILD nrpe-3.2.1-r2.ebuild 2476 BLAKE2B db4b5cccb4d03a0a5521b436e1c8d2a668b6a78aa4fe5edab7660711b86c8472ea934bfdc32dd1c81c4d0437aebcc70782d155537472a6d471bac243b94c3cc8 SHA512 d6c95485ba47471893ee641d5594bc688c9991890ee6c12bf03c579b189c2babc7ef17d473ad05610622ef40e0c2c4f34963cd87bba99afb269230829eb91c2a +MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27 diff --git a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch b/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch deleted file mode 100644 index 3af2ef95baba..000000000000 --- a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch +++ /dev/null @@ -1,204 +0,0 @@ -Add support for large output - -http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.htmlIndex: nrpe-2.14/include/common.h -=================================================================== -Index: nrpe-2.14/include/common.h -=================================================================== ---- nrpe-2.14.orig/include/common.h -+++ nrpe-2.14/include/common.h -@@ -41,7 +41,7 @@ - #define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */ - #define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting for connection more than this time */ - --#define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */ -+#define MAX_INPUT_BUFFER 16384 /* max size of most buffers we use */ - #define MAX_FILENAME_LENGTH 256 - - #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */ -@@ -55,12 +55,14 @@ - - #define QUERY_PACKET 1 /* id code for a packet containing a query */ - #define RESPONSE_PACKET 2 /* id code for a packet containing a response */ -+#define RESPONSE_PACKET_WITH_MORE 3 /* id code for a packet containing a response, with more data to follow */ - - #define NRPE_PACKET_VERSION_3 3 /* packet version identifier */ - #define NRPE_PACKET_VERSION_2 2 - #define NRPE_PACKET_VERSION_1 1 /* older packet version identifiers (no longer supported) */ - - #define MAX_PACKETBUFFER_LENGTH 1024 /* max amount of data we'll send in one query/response */ -+ /* WARNING - do not change this as older clients/servers will not work */ - - typedef struct packet_struct{ - int16_t packet_version; -Index: nrpe-2.14/src/check_nrpe.c -=================================================================== ---- nrpe-2.14.orig/src/check_nrpe.c -+++ nrpe-2.14/src/check_nrpe.c -@@ -221,6 +221,11 @@ int main(int argc, char **argv){ - return STATE_UNKNOWN; - } - -+ /* Altinity patch: Allow multiple packets to be received */ -+ /* Indentation not corrected to allow simpler patching */ -+ /* START MULTI_PACKET LOOP */ -+ do { -+ - /* wait for the response packet */ - bytes_to_recv=sizeof(receive_packet); - if(use_ssl==FALSE) -@@ -233,31 +238,24 @@ int main(int argc, char **argv){ - /* reset timeout */ - alarm(0); - -- /* close the connection */ --#ifdef HAVE_SSL -- if(use_ssl==TRUE){ -- SSL_shutdown(ssl); -- SSL_free(ssl); -- SSL_CTX_free(ctx); -- } --#endif -- graceful_close(sd,1000); -- - /* recv() error */ - if(rc<0){ - printf("CHECK_NRPE: Error receiving data from daemon.\n"); -+ graceful_close(sd,1000); - return STATE_UNKNOWN; - } - - /* server disconnected */ - else if(rc==0){ - printf("CHECK_NRPE: Received 0 bytes from daemon. Check the remote server logs for error messages.\n"); -+ graceful_close(sd,1000); - return STATE_UNKNOWN; - } - - /* receive underflow */ - else if(bytes_to_recv0) -+ send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE); -+ else -+ send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET); -+ - /* calculate the crc 32 value of the packet */ - send_packet.crc32_value=(u_int32_t)0L; - calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet)); -@@ -1303,6 +1319,9 @@ void handle_connection(int sock){ - SSL_write(ssl,&send_packet,bytes_to_send); - #endif - -+ } while (strlen(pbuffer) > 0); -+ /* END MULTI_PACKET LOOP */ -+ - #ifdef HAVE_SSL - if(ssl){ - complete_SSL_shutdown( ssl); diff --git a/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch b/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch deleted file mode 100644 index 81078c449713..000000000000 --- a/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in ---- nrpe-2.15.orig/configure.in 2013-09-06 08:27:13.000000000 -0700 -+++ nrpe-2.15/configure.in 2014-04-19 09:32:52.251766643 -0700 -@@ -6,7 +6,8 @@ - - AC_INIT([nrpe],[2.15],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org]) - AC_CONFIG_SRCDIR([src/nrpe.c]) --AC_CONFIG_HEADERS([include/config.h]) -+AC_CONFIG_HEADERS([include/autoconf.h]) - AC_CONFIG_FILES([Makefile -+ include/config.h - subst - src/Makefile -diff -Nuar --exclude '*.orig' nrpe-2.15.orig/include/config.h.in nrpe-2.15/include/config.h.in ---- nrpe-2.15.orig/include/config.h.in 2013-09-06 08:27:13.000000000 -0700 -+++ nrpe-2.15/include/config.h.in 2014-04-19 09:33:07.620035056 -0700 -@@ -26,6 +26,7 @@ - - #include - #include -+#include "autoconf.h" - - - #define DEFAULT_SERVER_PORT @nrpe_port@ /* default port to use */ diff --git a/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch b/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch deleted file mode 100644 index c42f8bfdec00..000000000000 --- a/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disallow all control characters in argument handling. - -This closes a security hole that allowed passing commands via the argument -handling, if a newline was used to seperate the argument from the rest of the -command. - -X-URL: http://www.exploit-db.com/exploits/32925/ -Signed-off-by: Robin H. Johnson - --- -I didn't find any patches from upstream NRPE, so I wrote this quick one. -If somebody else has a valid use for control characters in NRPE arguments, then -this could be relaxed slightly. - -diff -Nuar --exclude '*.orig' nrpe-2.15.orig/src/nrpe.c nrpe-2.15/src/nrpe.c ---- nrpe-2.15.orig/src/nrpe.c 2014-04-19 09:37:16.022373910 -0700 -+++ nrpe-2.15/src/nrpe.c 2014-04-19 09:46:53.237458939 -0700 -@@ -53,7 +53,7 @@ - - #define DEFAULT_COMMAND_TIMEOUT 60 /* default timeout for execution of plugins */ - #define MAXFD 64 --#define NASTY_METACHARS "|`&><'\"\\[]{};" -+#define NASTY_METACHARS "|`&><'\"\\[]{};\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f" - #define howmany(x,y) (((x)+((y)-1))/(y)) - #define MAX_LISTEN_SOCKS 16 - diff --git a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch deleted file mode 100644 index 3b3fc135455f..000000000000 --- a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch +++ /dev/null @@ -1,39 +0,0 @@ -Without this patch, you can't build nrpe without SSL support. It was -originally submitted on the Nagios forums by user Matthew L. Daniel: - - https://support.nagios.com/forum/viewtopic.php?t=27027 - -It was merged into the upstream github repo (NagiosEnterprises/nrpe) -in commit 3736fdeeac11a. - - -diff --git a/src/nrpe.c b/src/nrpe.c -index 4bc849b..1e55ab4 100644 ---- a/src/nrpe.c -+++ b/src/nrpe.c -@@ -102,7 +102,9 @@ int use_src=FALSE; /* Define parameter for SRC option */ - int listen_queue_size=DEFAULT_LISTEN_QUEUE_SIZE; - - -+#ifdef HAVE_SSL - void complete_SSL_shutdown( SSL *); -+#endif - - - int main(int argc, char **argv){ -@@ -1815,6 +1817,7 @@ int remove_pid_file(void){ - return OK; - } - -+#ifdef HAVE_SSL - void complete_SSL_shutdown( SSL *ssl) { - - /* -@@ -1835,6 +1838,7 @@ void complete_SSL_shutdown( SSL *ssl) { - if( SSL_shutdown( ssl)) break; - } - } -+#endif/*HAVE_SSL*/ - - /* bail if daemon is running as root */ - int check_privileges(void){ diff --git a/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch b/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch deleted file mode 100644 index b8a0811b831c..000000000000 --- a/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in ---- nrpe-2.15.orig/configure.in 2013-09-06 08:27:13.000000000 -0700 -+++ nrpe-2.15/configure.in 2014-04-19 09:20:50.406150828 -0700 -@@ -45,7 +45,7 @@ - AC_HEADER_STDC - AC_HEADER_TIME - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h tcpd.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h) -+AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -@@ -164,11 +164,20 @@ - AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl") - AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") - AC_SUBST(SOCKETLIBS) --AC_CHECK_LIB(wrap,main,[ -- LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" -+ -+AC_ARG_ENABLE([tcp-wrapper], -+ AS_HELP_STRING([--disable-tcp-wrapper], [Disable building with TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! @<:@default=enable@:>@])) -+ -+LIBWRAPLIBS="" -+AS_IF([test "x$enable_tcp_wrapper" != "xno"], [ -+ AC_CHECK_LIB([wrap],[hosts_access],[ -+ LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" - AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) -- ]) -+ AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library]) -+ ]) -+]) - AC_SUBST(LIBWRAPLIBS) -+ - AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket) - - dnl socklen_t check - from curl -@@ -440,8 +449,11 @@ - AC_SUBST(TARGET_PLATFORM) - - AC_ARG_ENABLE([command-args], -- AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]), -- AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])) -+ AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!])) -+ -+AS_IF([test "x$enable_command_args" = "xyes"], [ -+ AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments]) -+]) - - AC_ARG_ENABLE([bash-command-substitution], - AS_HELP_STRING([--enable-bash-command-substitution],[allows clients to pass bash command substitutions of the form $(command). *** THIS IS A HIGH SECURITY RISK! *** Read the SECURITY file before using this option!]), diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml index e47fd6fd83c9..6d48b12e1abf 100644 --- a/net-analyzer/nrpe/metadata.xml +++ b/net-analyzer/nrpe/metadata.xml @@ -15,9 +15,6 @@ Nagios/Icinga master. Make sure you understand the implications of this flag as it can be a security risk. - - Only build the check plugins for Nagios/Icinga, and not the daemon. - nagios diff --git a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild deleted file mode 100644 index afdbdc893c41..000000000000 --- a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils systemd toolchain-funcs multilib user autotools - -DESCRIPTION="Nagios Remote Plugin Executor" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="command-args libressl minimal selinux ssl tcpd" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )" -RDEPEND="${DEPEND} - !minimal? ( - || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) - ) - selinux? ( sec-policy/selinux-nagios )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /dev/null nagios - - elog "If you plan to use \"nrpe_check_control\" then you may want to specify" - elog "different command and services files. You can override the defaults" - elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables." - elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}" - elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}" -} - -src_prepare() { - # Add support for large output, - # http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html - epatch "${FILESDIR}"/${PN}-2.14-multiline.patch - - # fix configure, among others #326367, #397603 - epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch - - # otherwise autoconf will overwrite the custom include/config.h.in - epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch - - # improve handling of metachars for security - epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch - - # Fix build with USE="-ssl". - epatch "${FILESDIR}"/${PN}-2.15-no-ssl.patch - - sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' \ - contrib/nrpe_check_control.c || die - - # change the default location of the pid file - sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die - - # fix TFU handling of autoheader - sed -i -e '/#undef/d' include/config.h.in || die - - eautoreconf -} - -src_configure() { - local myconf - if use minimal; then - myconf="--disable-tcp-wrapper --disable-command-args" - else - myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)" - fi - - econf \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --with-nrpe-user=nagios \ - --with-nrpe-group=nagios \ - $(use_enable ssl) \ - ${myconf} -} - -src_compile() { - emake -C src check_nrpe $(use minimal || echo nrpe) - - # Add nifty nrpe check tool - $(tc-getCC) ${CPPFLAGS} ${CFLAGS} \ - -DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \ - -DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \ - ${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die -} - -src_install() { - dodoc LEGAL Changelog README SECURITY \ - contrib/README.nrpe_check_control \ - $(use ssl && echo README.SSL) - - exeinto /usr/$(get_libdir)/nagios/plugins - doexe src/check_nrpe nrpe_check_control - - use minimal && return 0 - - ## NON-MINIMAL INSTALL FOLLOWS ## - - insinto /etc/nagios - newins sample-config/nrpe.cfg nrpe.cfg - fowners root:nagios /etc/nagios/nrpe.cfg - fperms 0640 /etc/nagios/nrpe.cfg - - exeinto /usr/libexec - doexe src/nrpe - - newinitd "${FILESDIR}"/nrpe.init nrpe - systemd_dounit "${FILESDIR}/${PN}.service" - - insinto /etc/xinetd.d/ - newins "${FILESDIR}/nrpe.xinetd.2" nrpe - - if use tcpd; then - sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \ - "${D}"/etc/init.d/nrpe - fi -} - -pkg_postinst() { - elog "If you are using the nrpe daemon, remember to edit" - elog "the config file /etc/nagios/nrpe.cfg" - - if use command-args ; then - ewarn "" - ewarn "You have enabled command-args for NRPE. This enables" - ewarn "the ability for clients to supply arguments to commands" - ewarn "which should be run. " - ewarn "THIS IS CONSIDERED A SECURITY RISK!" - ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info" - fi -} diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild new file mode 100644 index 000000000000..430050c49b14 --- /dev/null +++ b/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit systemd user + +DESCRIPTION="Nagios Remote Plugin Executor" +HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" +SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="command-args libressl selinux ssl" + +DEPEND="sys-apps/tcp-wrappers + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +RDEPEND="${DEPEND} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) + selinux? ( sec-policy/selinux-nagios )" + +PATCHES=( "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" ) + +pkg_setup() { + enewgroup nagios + enewuser nagios -1 -1 -1 nagios +} + +src_configure() { + # The configure script tries to detect what OS, distribution, and + # init system you're running and changes the build/install process + # depending on what it comes up with. We specify fixed values + # because we don't want it guessing, for example, whether or not + # to install the tmpfiles.d entry based on whether or not systemd + # is currently running (OpenRC uses them too). + econf \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --with-nrpe-user=nagios \ + --with-nrpe-group=nagios \ + --with-piddir=/run \ + --with-opsys=unknown \ + --with-dist-type=unknown \ + --with-init-type=unknown \ + --with-inetd-type=unknown \ + $(use_enable command-args) \ + $(use_enable ssl) +} + +src_compile() { + emake all +} + +src_install() { + default + + dodoc CHANGELOG.md SECURITY.md + insinto /etc/nagios + newins sample-config/nrpe.cfg nrpe.cfg + fowners root:nagios /etc/nagios/nrpe.cfg + fperms 0640 /etc/nagios/nrpe.cfg + + newinitd "startup/openrc-init" nrpe + newconfd "startup/openrc-conf" nrpe + systemd_newunit "startup/default-service" "${PN}.service" + + insinto /etc/xinetd.d/ + newins "${FILESDIR}/nrpe.xinetd.2" nrpe + + rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' +} + +pkg_postinst(){ + elog 'Some users have reported incompatibilities between nrpe-2.x and' + elog 'nrpe-3.x. We recommend that you use the same major version for' + elog 'both your server and clients.' + + if use command-args ; then + ewarn '' + ewarn 'You have enabled command-args for NRPE. That lets clients' + ewarn 'supply arguments to the commands that are run, and IS A' + ewarn 'SECURITY RISK!' + ewarn'' + fi +} diff --git a/net-analyzer/nrpe/nrpe-3.2.1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1.ebuild deleted file mode 100644 index 3a4f9d8d2513..000000000000 --- a/net-analyzer/nrpe/nrpe-3.2.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit systemd user - -DESCRIPTION="Nagios Remote Plugin Executor" -HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" -SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="command-args libressl selinux ssl" - -DEPEND="sys-apps/tcp-wrappers - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -RDEPEND="${DEPEND} - || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) - selinux? ( sec-policy/selinux-nagios )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_configure() { - econf \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --with-nrpe-user=nagios \ - --with-nrpe-group=nagios \ - --with-piddir=/run \ - $(use_enable command-args) \ - $(use_enable ssl) -} - -src_compile() { - emake all -} - -src_install() { - default - - dodoc CHANGELOG.md SECURITY.md - insinto /etc/nagios - newins sample-config/nrpe.cfg nrpe.cfg - fowners root:nagios /etc/nagios/nrpe.cfg - fperms 0640 /etc/nagios/nrpe.cfg - - newinitd "startup/openrc-init" nrpe - newconfd "startup/openrc-conf" nrpe - systemd_newunit "startup/default-service" "${PN}.service" - - insinto /etc/xinetd.d/ - newins "${FILESDIR}/nrpe.xinetd.2" nrpe - - rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' -} - -pkg_postinst(){ - elog 'Some users have reported incompatibilities between nrpe-2.x and' - elog 'nrpe-3.x. We recommend that you use the same major version for' - elog 'both your server and clients.' - - if use command-args ; then - ewarn '' - ewarn 'You have enabled command-args for NRPE. That lets clients' - ewarn 'supply arguments to the commands that are run, and IS A' - ewarn 'SECURITY RISK!' - ewarn'' - fi -} diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index abd651f28691..a71221525b18 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -4,10 +4,16 @@ AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6 AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306 AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5 AUX ntopng-3.0-pointer-cmp.patch 340 BLAKE2B 2b361ac6fc25857125b192fab11cb1c060bef6fb220386ffaf5b3df68ee5f52e173fc63e3a70175d746df52ae258bb2fd01ab6b3888ccfd320700083540ab0e7 SHA512 30e0137046c5612d627c3efb7a17b303a04144e63dc14e3ffd393cd87444b623af6430a6520181e5cf3fef5e89e51594c9700306bba1ffea2a9e6795e7c5e861 +AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1c19f6294bc47f2b26b6aa27d078edfc78b16142ea13c3e6a679ba541dcb2185b82af4969e621454fa97566a68e6e5 SHA512 567cea5b632b9a2d405cfb8058ef1ec204506084286ba4d7e86b64939a0ab7b3bd1204473a194ab7cf16195e76abcd4b77a05c20b1516cdbc59f431feb5cec16 +AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029 +AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e +AUX ntopng-3.8-ndpi-includes.patch 528 BLAKE2B c8a874f83aae75b0691ea9c9eeaaaeaac021de9f2e1d7a1bc1024acf927c36449d13df022ea6df5c2f09af68628aee5adef9039db5f7a3d6aa36da6c9d7924fa SHA512 593923665752322207bde864850bdfca7d1f75ea1270f1abd514b648f0fe6a539f4925837bebf433a3ffc82ae60edaafeaeaca2e19a58e87459e6caea245e59b AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 -EBUILD ntopng-2.4.ebuild 1724 BLAKE2B bfa8ed23ce2b4a5e7b0de83cda74a0211f89868e718cfe027f4c282db9e939b5efd6b48dd8d68cef4714dd238e8126e2a5716cdc939f04511599abaa5b7e2a0d SHA512 4c0298162c77666ee7ec2b3fa139468f5fc61e25baef6f7a55f5057dee1238e951e6d6b6ab7b824e31791172912bd106ae28ccafcf42fd89622676400a8132b1 -EBUILD ntopng-3.0-r3.ebuild 1631 BLAKE2B b77cffb6554e04821db246fe2bfb1ba0468a63a5b456b6bde71c5c36886173b78d00c0fe46359ce90fbe66ce96a12bfcb2d607eef778f6c230abf5769e44f228 SHA512 892942a332dfce2bca02e8ace13fea7da75089c0ca0b8e68b5e2b7294d51a3f8f375cf7acffd0a34e26a177cb6e232153b7b50350b2e457f6beba3f2a6239c60 +DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f +EBUILD ntopng-2.4-r1.ebuild 1713 BLAKE2B 412ffa5d8596bf4f2d5701864cc12a542c13442c99c3652d8df3790f0aec24b2d8f3d151c7b560d492c2f74ba6dc1b1b24358cb7e9b22ee26d89ca14032108b5 SHA512 a5a42e0f4de1feefd5cfc8c407b375ce9b5587568de90f5fbc2e4c3f53c08df6f645e5abd95eddd6edb136f519bf3b56b8107298e0fb6e126d0f9bc286946a15 +EBUILD ntopng-3.0-r4.ebuild 1622 BLAKE2B 1db14760398455995b4584065665032b2304d0e5699001e9ee7727bb0cf31272422e8de56b9aa5ec1778d27419f60ad38008b248114fbd49781229de38ac546e SHA512 e2591cd2c833021f08e45c5ae24843deef9ca7d745e68462618592a2205df3e341c76361bc9046d8d0797d515b099f2139e889bc4caa5a1f42996ed6154dffa2 +EBUILD ntopng-3.8.ebuild 1727 BLAKE2B c95da883fdd8b8e9828345248d8dea86f7a326e799e1ec413e06f32eeb620efc45a20ab93a7c005307c5877ef5285a368db4dc1fa9b15c7c480e5775c15ea3f6 SHA512 3a04bfdf57bec06b39a470692a319f38d9204a0e88e63b4a02b16c2da5caf16a0639a8ced42a4f1de42e3651ea657a5b22eb4674180049c3cafcae89eb56fb39 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996 diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch new file mode 100644 index 000000000000..303826a918df --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch @@ -0,0 +1,19 @@ +--- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp ++++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + #include "tcp_connecter.hpp" + #include "stream_engine.hpp" +@@ -207,7 +208,7 @@ + options.reconnect_ivl_max > options.reconnect_ivl) + // Calculate the next interval + current_reconnect_ivl = +- min (current_reconnect_ivl * 2, options.reconnect_ivl_max); ++ std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max); + return interval; + } + diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch new file mode 100644 index 000000000000..62c328a3505e --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch @@ -0,0 +1,17 @@ +--- a/configure.seed ++++ b/configure.seed +@@ -355,13 +355,7 @@ + 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-3.8-ndpi-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch new file mode 100644 index 000000000000..1308a5c2c03f --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch @@ -0,0 +1,12 @@ +--- a/src/NetworkInterface.cpp ++++ b/src/NetworkInterface.cpp +@@ -1604,7 +1604,8 @@ + ndpi_protocol icmp_proto = flow->get_detected_protocol(); + + if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) { +- ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto); ++ ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr *)ip)->saddr, ++ ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto); + flow->setDetectedProtocol(icmp_proto, false); + } + } diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch new file mode 100644 index 000000000000..068f1e9fa9b9 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch @@ -0,0 +1,14 @@ +--- a/configure.seed 2018-10-08 21:33:09.403001834 -0600 ++++ b/configure.seed 2018-10-08 21:35:47.404002203 -0600 +@@ -129,9 +129,9 @@ + fi + + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ +- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi ++ 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_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) diff --git a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild new file mode 100644 index 000000000000..3e53ff545180 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools eutils user toolchain-funcs + +DESCRIPTION="Network traffic analyzer with web interface" +HOMEPAGE="https://www.ntop.org/" +SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-db/sqlite:3 + dev-python/pyzmq + dev-lang/luajit:2 + dev-libs/json-c:= + dev-libs/geoip + dev-libs/glib:2 + dev-libs/hiredis + dev-libs/libxml2 + net-analyzer/rrdtool + net-libs/libpcap + net-misc/curl + dev-db/mysql-connector-c + !net-libs/nDPI" +RDEPEND="${DEPEND} + dev-db/redis" + +S="${WORKDIR}/${P}-stable" + +src_prepare() { + cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac" + epatch "${FILESDIR}/${P}-dont-build-ndpi.patch" + epatch "${FILESDIR}/${P}-mysqltool.patch" + epatch "${FILESDIR}/${P}-cxx.patch" + sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac" + eautoreconf + + cd "${S}/nDPI" + eautoreconf +} + +src_configure() { + tc-export CC CXX LD NM OBJDUMP PKG_CONFIG + cd "${S}/nDPI" + econf + cd "${S}" + econf +} + +src_compile() { + cd "${S}/nDPI" + emake + + cd "${S}" + emake +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + dodir ${SHARE_NTOPNG_DIR} + insinto ${SHARE_NTOPNG_DIR} + doins -r httpdocs + doins -r scripts + + exeinto /usr/bin + doexe ${PN} + doman ${PN}.8 + + newinitd "${FILESDIR}/ntopng.init.d" ntopng + newconfd "${FILESDIR}/ntopng.conf.d" ntopng + + dodir "/var/lib/ntopng" + fowners ntopng "/var/lib/ntopng" +} + +pkg_setup() { + enewuser ntopng +} + +pkg_postinst() { + elog "ntopng default creadential are user='admin' password='admin'" +} diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild deleted file mode 100644 index d024ad1f63db..000000000000 --- a/net-analyzer/ntopng/ntopng-2.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libxml2 - net-analyzer/rrdtool - net-libs/libpcap - net-misc/curl - virtual/libmysqlclient - !net-libs/nDPI" -RDEPEND="${DEPEND} - dev-db/redis" - -S="${WORKDIR}/${P}-stable" - -src_prepare() { - cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac" - epatch "${FILESDIR}/${P}-dont-build-ndpi.patch" - epatch "${FILESDIR}/${P}-mysqltool.patch" - epatch "${FILESDIR}/${P}-cxx.patch" - sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac" - eautoreconf - - cd "${S}/nDPI" - eautoreconf -} - -src_configure() { - tc-export CC CXX LD NM OBJDUMP PKG_CONFIG - cd "${S}/nDPI" - econf - cd "${S}" - econf -} - -src_compile() { - cd "${S}/nDPI" - emake - - cd "${S}" - emake -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "${EPREFIX}/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default creadential are user='admin' password='admin'" -} diff --git a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild deleted file mode 100644 index 18736380ba1b..000000000000 --- a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools user 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/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libsodium:= - dev-libs/libxml2 - net-analyzer/rrdtool - net-libs/libpcap - =net-libs/nDPI-2.0 - net-misc/curl - sys-libs/binutils-libs:= - virtual/libmysqlclient" -RDEPEND="${DEPEND} - dev-db/redis" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-mysqltool.patch - "${FILESDIR}"/${P}-pointer-cmp.patch -) - -src_prepare() { - sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die - - default - - eautoreconf -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - 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 - - dodir "/var/lib/ntopng" - fowners ntopng "${EPREFIX}/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -} diff --git a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild new file mode 100644 index 000000000000..2a126bff0473 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools user 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/sqlite:3 + dev-python/pyzmq + dev-lang/luajit:2 + dev-libs/json-c:= + dev-libs/geoip + dev-libs/glib:2 + dev-libs/hiredis + dev-libs/libsodium:= + dev-libs/libxml2 + net-analyzer/rrdtool + net-libs/libpcap + =net-libs/nDPI-2.0 + net-misc/curl + sys-libs/binutils-libs:= + dev-db/mysql-connector-c:=" +RDEPEND="${DEPEND} + dev-db/redis" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-mysqltool.patch + "${FILESDIR}"/${P}-pointer-cmp.patch +) + +src_prepare() { + sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die + + default + + eautoreconf +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + dodir ${SHARE_NTOPNG_DIR} + insinto ${SHARE_NTOPNG_DIR} + doins -r httpdocs + doins -r scripts + + dodir ${SHARE_NTOPNG_DIR}/third-party + 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 + + dodir "/var/lib/ntopng" + fowners ntopng "/var/lib/ntopng" +} + +pkg_setup() { + enewuser ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild b/net-analyzer/ntopng/ntopng-3.8.ebuild new file mode 100644 index 000000000000..adb578b7ff8b --- /dev/null +++ b/net-analyzer/ntopng/ntopng-3.8.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools user 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/sqlite:3 + dev-python/pyzmq + dev-lang/luajit:2 + dev-libs/json-c:= + dev-libs/geoip + dev-libs/glib:2 + dev-libs/hiredis + dev-libs/libsodium:= + dev-libs/libxml2 + dev-libs/libmaxminddb + net-analyzer/rrdtool + net-libs/libpcap + >=net-libs/nDPI-2.4 + net-misc/curl + sys-libs/binutils-libs + dev-db/mysql-connector-c:=" +RDEPEND="${DEPEND} + dev-db/redis" +PATCHES=( + "${FILESDIR}"/${P}-mysqltool.patch + "${FILESDIR}"/${P}-ndpi-includes.patch + "${FILESDIR}"/${P}-missing-min.patch + "${FILESDIR}"/${P}-ndpi-call.patch +) + +src_prepare() { + default + sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac + eapply_user + eautoreconf +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + dodir ${SHARE_NTOPNG_DIR} + insinto ${SHARE_NTOPNG_DIR} + doins -r httpdocs + doins -r scripts + + dodir ${SHARE_NTOPNG_DIR}/third-party + 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 + + dodir "/var/lib/ntopng" + fowners ntopng "/var/lib/ntopng" +} + +pkg_setup() { + enewuser ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest index 2a0ac0af8fd6..7e83170c6a79 100644 --- a/net-analyzer/pypacker/Manifest +++ b/net-analyzer/pypacker/Manifest @@ -1,7 +1,9 @@ DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8 DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545 DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3 +DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227 EBUILD pypacker-2.9.ebuild 696 BLAKE2B 3ec2822ab28c7ab75e6a2cd049ad397a4ef86c54f60d06f87c8d544e911a0d513651211dc4020f267e864db782188f3c4e31d749e58a1656427ad68b3b1ff67d SHA512 7fc02ab96434a780d5e6f51e8ccd6f5c2fbbe8227e4f41ba93f85f0894d805f028a6cc3e8321a9455079335698f558a796944c6a7be37ceb40413d4b6098350b EBUILD pypacker-4.6.ebuild 696 BLAKE2B 849590e13844edc4d6d08d4995e3284f0aa1e7a90ca969802f6525046197984d6e6c5d4a3f07ac4def5be19812395924a68c102d1bbc8a690405af1530b1526e SHA512 7f80a767611317ded7eb0e94f3b62add6432acdac9c95ac92d2bb2155b34ef1f991a094cdc9db731b7eb8a171bc5af6ac2afd27b882579922f17240e082352d4 EBUILD pypacker-4.7.ebuild 697 BLAKE2B 3e6cb3ecdc10198d651dd726974ce7ac81b45e9b7fa191c02595afe26ac4f271be55468c1b68ba85c5bc35ab4dea468d7518e359fd9a19bdb8f7fa42efc3881f SHA512 f6f896ce34a9b056b2e0c1af1200404b49457c85daeff4df86661674faf667d10c21a52f618409b06be054a7d505dae2c6c26cd4135097099c0c133bf513ddf7 +EBUILD pypacker-4.8.ebuild 696 BLAKE2B 6167963cfc8e5796fcaccfb1044744511340eb3c5bb3cde52a6878de8dcbdfd7177a471d861a1598ec6a3b667afe3c793f2a3bdb205800571220f605df3b5612 SHA512 f88d3524eb9415642b164fe42e58e290a06f6f284d3951bb98d1dbce3cd54661628908abce86936076218f094400b05801094e2f4070123999578430dda3b50e MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild new file mode 100644 index 000000000000..5d76249812e6 --- /dev/null +++ b/net-analyzer/pypacker/pypacker-4.8.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Fast and simple packet creation and parsing library for Python" +HOMEPAGE="https://gitlab.com/mike01/pypacker" +SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +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/sarg/Manifest b/net-analyzer/sarg/Manifest index deab42521460..f44dfb0a481b 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,6 +1,8 @@ AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda +AUX sarg-2.3.11-Werror.patch 1012 BLAKE2B f3e9b66c95fe905817c2ceecc52e863c4c0eb9c09d96a525c7876a5f807160421f694b95a02f8f1d62e1292102218c6a1fecf3ed1dedd8f0c7b6b9293322c034 SHA512 e74013c3bc22248ba08656b8751ca6177aeb070ce06661279ee3208ffa62dac8014fed0d6e35b65627ce6f02e70ed662b41dccf21dae8ff2b4e5902cc141e358 AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4 AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6 EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973 +EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch new file mode 100644 index 000000000000..035578793934 --- /dev/null +++ b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch @@ -0,0 +1,25 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -46,18 +46,18 @@ + CFLAGS="${saved_CFLAGS}" + fi + +-AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC]) ++AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC]) + saved_CFLAGS="${CFLAGS}" +-CFLAGS="${CFLAGS} -Werror=implicit-function-declaration" ++CFLAGS="${CFLAGS} -Wimplicit-function-declaration" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"]) + AC_MSG_RESULT($have_implicit_function_declaration) + if test "$have_implicit_function_declaration" = "no" ; then + CFLAGS="${saved_CFLAGS}" + fi + +-AC_MSG_CHECKING([for format error flag in $CC]) ++AC_MSG_CHECKING([for format warning flag in $CC]) + saved_CFLAGS="${CFLAGS}" +-CFLAGS="${CFLAGS} -Werror=format" ++CFLAGS="${CFLAGS} -Wformat" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"]) + AC_MSG_RESULT($have_error_format) + if test "$have_error_format" = "no" ; then diff --git a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild new file mode 100644 index 000000000000..c8afb3c48d45 --- /dev/null +++ b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Squid Analysis Report Generator" +HOMEPAGE="https://sourceforge.net/projects/sarg/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" +IUSE="+gd ldap pcre" + +DEPEND=" + gd? ( media-libs/gd[png,truetype] ) + ldap? ( net-nds/openldap ) + pcre? ( dev-libs/libpcre ) +" +RDEPEND=" + ${DEPEND} +" +DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.10-config.patch + "${FILESDIR}"/${PN}-2.3.11-configure.patch + "${FILESDIR}"/${PN}-2.3.11-format.patch + "${FILESDIR}"/${PN}-2.3.11-Werror.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_with gd) \ + $(use_with ldap) \ + $(use_with pcre) \ + --sysconfdir="${EPREFIX}/etc/sarg/" +} diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest index 61165138ce18..fc5b36f130d7 100644 --- a/net-analyzer/speedtest-cli/Manifest +++ b/net-analyzer/speedtest-cli/Manifest @@ -1,5 +1,5 @@ -DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723 DIST speedtest-cli-2.1.1.tar.gz 24380 BLAKE2B ea6f5fc3127246ad4cf90dee4b53529fa9f3b9b9558c9ebb92661380663a5e5950490e91cda97f9207b26c23464026b91c8faa50ef5a515b817b0f84fcb2e13b SHA512 afc1fc0264d5124efe5afc9b0583b2b37ae50eac229e6971656a906b9a7a78d44158485d5c2e44c3430694fd7355926f578a54a196cc9b9baf6cfbc357a789d1 -EBUILD speedtest-cli-2.0.2.ebuild 659 BLAKE2B b1158cc13f1edcf3430f0ba7973a5d5bb617aa836cf9ccf08c7b15b57585642468a41237de0cb9e7254f2fc5a8f997529c1a323c5d4b10173d183d585f3702d0 SHA512 3830ba3d46b8391cd2f0f63a11f70acda45af07cc8025ca4ac1aba574312634f754558cb54bf40c2d051c20a06221f193610f45bbfd76836e7ea24e936eb9324 -EBUILD speedtest-cli-2.1.1.ebuild 661 BLAKE2B 6dbca712919867894da38ae045b6b737b7b50f79b70a7aab04373aeb086928888d486e33728073108f7ce1eb2b350598f7c0ba9a28b825a7d759c503d8c03e86 SHA512 6085506ffd9e89f83538e7aae5a816c50b0f9a87e3a945633ac1631d3d46344ba1839030eff091eeecaa0dc5651aef6bd96aaf41f70179470b462c78f297c7f1 +DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd +EBUILD speedtest-cli-2.1.1.ebuild 659 BLAKE2B b38afdbb04d3e6ea17250d35cc320fe8a54218c9f8c74c5f3c5aab05407e624a7b5567dbebec34459e64c262e0eca3ee82339e3f557b672b1f70a3b4be6a3843 SHA512 9f287b6ca567d954629bf40af89a7cb638ddb4aa7357e8f8728ea2c8307a171f9eb94fa23e6d6b65e1989ca828a0ce54a8e3137ae681e709c922b52c546a7bdf +EBUILD speedtest-cli-2.1.2.ebuild 661 BLAKE2B 6dbca712919867894da38ae045b6b737b7b50f79b70a7aab04373aeb086928888d486e33728073108f7ce1eb2b350598f7c0ba9a28b825a7d759c503d8c03e86 SHA512 6085506ffd9e89f83538e7aae5a816c50b0f9a87e3a945633ac1631d3d46344ba1839030eff091eeecaa0dc5651aef6bd96aaf41f70179470b462c78f297c7f1 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild deleted file mode 100644 index 3e6301cf17bf..000000000000 --- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) - -inherit distutils-r1 - -DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net" -HOMEPAGE="https://github.com/sivel/speedtest-cli" -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 -} diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild index 8c5b2bfd8f88..1dbd4e633bf5 100644 --- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild +++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild @@ -13,7 +13,7 @@ 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" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild new file mode 100644 index 000000000000..8c5b2bfd8f88 --- /dev/null +++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) + +inherit distutils-r1 + +DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net" +HOMEPAGE="https://github.com/sivel/speedtest-cli" +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 +} diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 52aea4c6a8a5..ef98d053a6df 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,4 +1,6 @@ +AUX tcpdump-4.9.2-includedir.patch 2027 BLAKE2B b9fc28ec180095f9b6e47e9a1ccd75d479029cfb19d6f1ff53595a25cab4c68d1ca55df0f702dfae86e264e4b7d3f645f3fac1b548bb6d62cec58306ae19e88a SHA512 054af892c4948926d23b6b7a4f93ac00ab8f258181784598a4097dd8f8b641ddeaedf3c9924b940b860929e086810037d3a672fabd03427b4bb41d3020013c27 DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b +EBUILD tcpdump-4.9.2-r1.ebuild 2196 BLAKE2B 3fa9633aec8cbf4fade7622b445336fb79d90b361299ad18d0704e613e749d05204f44b0e75b489692dc5851dcc1d987719c7f6cc4d1e5f5b9265775c1ffcc88 SHA512 6573400c2c12725e5c791756de76854c38869cbabe35c208c479beda30893f0f029011f407bd56f0ae6dd8a63a5dddf45f57d49b51babf25a966a407e0cdbe6b EBUILD tcpdump-4.9.2.ebuild 2074 BLAKE2B 94a22e1acea10408c02fcca114547eba248491b0a99505ee369549c681e23e5a5ffa51f4dd43ba6ae2eaa79d0abc85f1f5c1f9a057a96c70189d47e9d98e0028 SHA512 48bd328212aae63dc3f0361352f93b29edb165cbbe12f7d92cc3588c9240e4584e5257bda6adc52872b271e72dfcd65cbd78d79b1faf86b76088fe4f3244376f -EBUILD tcpdump-9999.ebuild 2202 BLAKE2B bda2d7229a0da196d4a16b263cea1b3a48197485e48118fa368288c8a1ed5138b0090017321528d22a56b20ab0fae177e9b798e7ef4e8d1c1cf41dc73d23d1e7 SHA512 c6a450a094a69fb62b9b742c1fbd63bd8fb30326bffc484f19e60c6ab7fe6e4ae2f0fd73b6330ddb4b825db3f919cd62b0a18e3f40a673d3250e7ff10a1991dc +EBUILD tcpdump-9999.ebuild 2199 BLAKE2B 4931c70244b037b100cbabad036f2cb14a675d6bb0cec61697bcb2b996d18ee18e38afe6d04cec9e07b78b222cf5ef1f2cf01205eef137f7df5eb7d931605744 SHA512 57e1a444b5a345b2acc2cc14e64fd2298b6d8b20fcf45a9352ddfb3a6a16220fb078b0e4382031eb1b3ed61b7b33ab30c2790c7f1adb15a68701fd57fbe97f9f MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch new file mode 100644 index 000000000000..0f74fa9a8a3f --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch @@ -0,0 +1,65 @@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -534,40 +534,6 @@ + if test $libpcap = FAIL ; then + AC_MSG_ERROR(see the INSTALL doc for more info) + fi +- dnl +- dnl Some versions of Red Hat Linux put "pcap.h" in +- dnl "/usr/include/pcap"; had the LBL folks done so, +- dnl that would have been a good idea, but for +- dnl the Red Hat folks to do so just breaks source +- dnl compatibility with other systems. +- dnl +- dnl We work around this by assuming that, as we didn't +- dnl find a local libpcap, libpcap is in /usr/lib or +- dnl /usr/local/lib and that the corresponding header +- dnl file is under one of those directories; if we don't +- dnl find it in either of those directories, we check to +- dnl see if it's in a "pcap" subdirectory of them and, +- dnl if so, add that subdirectory to the "-I" list. +- dnl +- dnl (We now also put pcap.h in /usr/include/pcap, but we +- dnl leave behind a /usr/include/pcap.h that includes it, +- dnl so you can still just include .) +- dnl +- AC_MSG_CHECKING(for extraneous pcap header directories) +- if test \( ! -r /usr/local/include/pcap.h \) -a \ +- \( ! -r /usr/include/pcap.h \); then +- if test -r /usr/local/include/pcap/pcap.h; then +- d="/usr/local/include/pcap" +- elif test -r /usr/include/pcap/pcap.h; then +- d="/usr/include/pcap" +- fi +- fi +- if test -z "$d" ; then +- AC_MSG_RESULT(not found) +- else +- $2="-I$d $$2" +- AC_MSG_RESULT(found -- -I$d added) +- fi + fi + else + $1=$libpcap +@@ -1351,11 +1351,4 @@ + -f "$1/$tmplib/libcrypto.dylib" \); then + ac_cv_ssleay_path="$1" + fi +- +- # +- # Make sure we have the headers as well. +- # +- if test -d "$1/include/openssl" -a -f "$1/include/openssl/des.h"; then +- incdir="-I$1/include" +- fi + ]) +--- a/configure.in ++++ b/configure.in +@@ -908,7 +908,6 @@ + # Put the subdirectories of the libcrypto root directory + # at the front of the header and library search path. + # +- CFLAGS="-I$withval/include $CFLAGS" + LIBS="-L$withval/lib $LIBS" + fi + ],[ diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild new file mode 100644 index 000000000000..7e89e1714aaf --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs user + +DESCRIPTION="A Tool for network monitoring and data acquisition" +HOMEPAGE=" + http://www.tcpdump.org/ + https://github.com/the-tcpdump-group/tcpdump +" +SRC_URI=" + http://www.tcpdump.org/release/${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="+drop-root libressl smi ssl samba suid test" + +RDEPEND=" + drop-root? ( sys-libs/libcap-ng ) + net-libs/libpcap + smi? ( net-libs/libsmi ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) + libressl? ( dev-libs/libressl:= ) + ) +" +DEPEND=" + ${RDEPEND} + drop-root? ( virtual/pkgconfig ) + test? ( + || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) + dev-lang/perl + ) +" +PATCHES=( + "${FILESDIR}"/${PN}-4.9.2-includedir.patch +) + +pkg_setup() { + if use drop-root || use suid; then + enewgroup tcpdump + enewuser tcpdump -1 -1 -1 tcpdump + fi +} + +src_prepare() { + default + + mv aclocal.m4 acinclude.m4 || die + + eautoreconf + + sed -i -e '/^eapon1/d;' tests/TESTLIST || die + + # bug 630394 + sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die +} + +src_configure() { + if use drop-root; then + append-cppflags -DHAVE_CAP_NG_H + export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) + fi + + econf \ + $(use_enable samba smb) \ + $(use_with drop-root chroot '') \ + $(use_with smi) \ + $(use_with ssl crypto "${EPREFIX}/usr") \ + $(usex drop-root "--with-user=tcpdump" "") +} + +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:tcpdump /usr/sbin/tcpdump + fperms 4110 /usr/sbin/tcpdump + fi +} + +pkg_preinst() { + if use drop-root || use suid; then + enewgroup tcpdump + enewuser tcpdump -1 -1 -1 tcpdump + fi +} + +pkg_postinst() { + use suid && elog "To let normal users run tcpdump add them into tcpdump group." +} diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index 5386a5f79cea..c4fe962e8128 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs user DESCRIPTION="A Tool for network monitoring and data acquisition" diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest index 13b7c7754f9a..ec551e18b181 100644 --- a/net-analyzer/tcpflow/Manifest +++ b/net-analyzer/tcpflow/Manifest @@ -8,5 +8,5 @@ DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 BLAKE2B a7c1725d2a82a6ef63800c3 DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 BLAKE2B 282849bded34acc79ece4b06c72d5ed05ada07bb2e1a5e6e15dd7c6c46f8f1e57b5bfb018b1a23bdd543d0664b3bd5a3f756342fd657930a77c1ab8307358421 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85 EBUILD tcpflow-1.4.5_p1-r1.ebuild 1119 BLAKE2B 47a36a5f641e96a2a16afc41c02468ea83b93b425b7c6f1e7f3382321119d3459cbe7e1c9e4a42e02a73fe205d9da21f7afe596c543f6d5879bc5d0fa2b0bbbe SHA512 bbaaf72e7ab163093392d1c4c690281f84100209f4084f351c60823bbbf94e7787530dc75120123ff4a7f4439de06d1a1c815a97185f0735753444d374d8506b EBUILD tcpflow-1.4.5_p4-r1.ebuild 1132 BLAKE2B 431b20f5779a0cb828d321069300f12348f75f47d75dd9d2fd7411bebe956f0f40085ff1a0e33fd5036bc919881d07972506ae2dea4362c6f63713eb433d0c33 SHA512 e781ef6618cbd549828bf426c2fdd9511b037d149f45279d54da658b48b5e6302e62b278e9fe36782cf458e2a335263507efb3be8134d698900c4530455a1bfa -EBUILD tcpflow-1.5.2.ebuild 1467 BLAKE2B eb7752d796db2c7727ac3b3aa8bfceba4db245d01efdd3d2f0d55815ae6bccab9d69fe0947bf68dab3b8ed1a5e15a99df965ebd20676297e0049d5c1d505ffff SHA512 5c53a52906ddc2ac8e9e6d23b760a27cfbe4bbc546bc09a7500a54df924ac2a527ea337af9d7895138b12e56b000013ec1931f12b6ced376d9f90f7a8524b97e +EBUILD tcpflow-1.5.2-r1.ebuild 1571 BLAKE2B 7fef6a92a455d62a4e253a7e1c25b0b2c92b61c5be950f4c76079cdcec4a1d120e1ebc8726b9d2c608b781d701b0070d299fa866bafd71ca073ac800d023d7b1 SHA512 a3005f38a0998dddb0136dbba1b686afa019a93c1c44ea311eb78cc21583ee663f89b99a00f6b3278d6e689b754f043f5d0e7286cd4bfcd48fa716cad61a5a96 MISC metadata.xml 360 BLAKE2B e69d4aa24b5949bff690f0dd8e735d85e975424fec366d7952232a9efd223c163b57684eadde0ddaee26cb0a763e09b64ef7b6361e97611e2369eb1b037d7341 SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08 diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild new file mode 100644 index 000000000000..bf0aeffb4aab --- /dev/null +++ b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) +inherit autotools flag-o-matic python-single-r1 + +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://dev.gentoo.org/~jer/be13_api-20170924.tar.gz + https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz + https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz +" + +LICENSE="GPL-3" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +SLOT="0" +IUSE="cairo test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-db/sqlite + dev-libs/boost:= + dev-libs/openssl:= + net-libs/http-parser:= + net-libs/libpcap + sys-libs/libcap-ng + sys-libs/zlib:= + cairo? ( + x11-libs/cairo + ) +" +DEPEND=" + ${RDEPEND} + test? ( sys-apps/coreutils ) +" +S=${WORKDIR}/${PN}-${P/_/} +PATCHES=( + "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch + "${FILESDIR}"/${PN}-1.5.2-gentoo.patch +) + +src_prepare() { + mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die + mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die + + default + + eautoreconf +} + +src_configure() { + append-cxxflags -fpermissive + econf $(usex cairo --enable-cairo=true --enable-cairo=false) +} diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild deleted file mode 100644 index 0271f130a3ba..000000000000 --- a/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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://dev.gentoo.org/~jer/be13_api-20170924.tar.gz - https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz - https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz -" - -LICENSE="GPL-3" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -SLOT="0" -IUSE="cairo test" - -RDEPEND=" - dev-db/sqlite - dev-lang/python:2.7= - dev-libs/boost:= - dev-libs/openssl:= - net-libs/http-parser:= - net-libs/libpcap - sys-libs/libcap-ng - sys-libs/zlib:= - cairo? ( - x11-libs/cairo - ) -" -DEPEND=" - ${RDEPEND} - test? ( sys-apps/coreutils ) -" -S=${WORKDIR}/${PN}-${P/_/} -PATCHES=( - "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch - "${FILESDIR}"/${PN}-1.5.2-gentoo.patch -) - -src_prepare() { - mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die - mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die - - default - - eautoreconf -} - -src_configure() { - append-cxxflags -fpermissive - econf $(usex cairo --enable-cairo=true --enable-cairo=false) -} diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest index bebd27093d63..6ce9163bdead 100644 --- a/net-analyzer/tcpstat/Manifest +++ b/net-analyzer/tcpstat/Manifest @@ -1,6 +1,8 @@ +AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9 AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab EBUILD tcpstat-1.5-r1.ebuild 865 BLAKE2B b904e297122d5640de2f88c68124bf6a6945f41e0a60632c0813422ae0496da917093e2e47968d7e919110521f3ce5adc24de853b3cae2b29ee9b2f1e9e23af5 SHA512 f74ee7b2f110edbacf08085e95d8409ac35e85a656439156e4c98e09b5bac06dc5a91ea91eb13cd51f30f085bc6be6433da95a42fba67039bfa4d8c18e5896ed EBUILD tcpstat-1.5-r2.ebuild 725 BLAKE2B 111495835579d8b584959fb232be6bf813886dc26de21585b2f7b820da8cf390dde050a9c257d74633802236449943e801d65df5482473c5ed08964bf6230a01 SHA512 5379b0dc23729ff8c4a3148dccb0efa5ff2971eb39c0939ff795ad8923b95917191db1e3809bd9c05e5a4b2fa12db4e13a407e94976f28af580ad0595c46d672 +EBUILD tcpstat-1.5-r3.ebuild 859 BLAKE2B 5f32b003b52942bd8b1d74a20b99e64d25b37272d95550afd6ba11aca2ae875c6a75b83c106ecec76424455138f9be2ad1024de96d3abe6019a906a1e46645a3 SHA512 6a2613d431804324507e49a835612e5ed59db0850f038a23b64c63f6177e2b8bf85ed7bb061b991ef63b4e1e542b8b113bd2c6216e34b1c913cbd399d6e7fef3 EBUILD tcpstat-1.5.ebuild 561 BLAKE2B aa14697eab225735f94826244653ec1c5cfd97799fc46adc6a17924f244c52841babaec0d20005f7599cefb79a9878a1eeb38fb9e2b65a8a5b148978ffe8048b SHA512 47cdb87e19a06b557e9ec1253790cb349929f04690d8f760b4e78e68ea5fa8ddb84e4edf87d8b22200c20d3cb3222867d538537debe22b6c934677d230995aa6 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch new file mode 100644 index 000000000000..e3e0df933d5c --- /dev/null +++ b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -68,7 +68,7 @@ + case $my_build_os in + aix*) AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;; + osf1*) AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;; +- linux*) AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;; ++ linux*) AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;; + bsd/os*) ;; + freebsd*) ;; + sunos*) ;; diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild new file mode 100644 index 000000000000..64128ffed42c --- /dev/null +++ b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic + +DESCRIPTION="Reports network interface statistics" +HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/" +SRC_URI="${HOMEPAGE}${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6" + +DEPEND=" + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" +DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) +PATCHES=( + "${FILESDIR}"/${P}-db.patch + "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cflags -Wall -Wextra + econf \ + $(use_enable ipv6) \ + --with-pcap-include='' \ + --with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)" +} + +src_install() { + default + dobin src/{catpcap,packetdump} + newdoc src/README README.src +} diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest index 2591ddc2933d..cd5e3bef698d 100644 --- a/net-analyzer/telegraf/Manifest +++ b/net-analyzer/telegraf/Manifest @@ -206,7 +206,7 @@ DIST telegraf-1.10.4-vendor.tar.gz 69744868 BLAKE2B 97123bb14b89d28519c734264911 DIST telegraf-1.10.4.tar.gz 1372505 BLAKE2B f3064cd71b1b6f9a8aae8e5425813386bd6d4e4f06c2e95f35c09d055aef6b811867bb1fe1724e88311f82e8214a1c7ae23a0b5ab8461cfa6b0adebe3b86cb28 SHA512 7e6c27bb5b94382f00f48ce98906f7e505abe734b47e29c2c07f245c2c5c12c522eb3f59be2773bfea78316b7b808d0d425d07fa7c247af7cd280a041759cc34 DIST telegraf-1.5.3.tar.gz 911976 BLAKE2B 3e67a037eb22be88de700131f15120faa13b7a9bd8404f76c29376e3e4da630d84767fd8cbff45b3e14e6ce836dcc68a2a87b462eb91d398d57370c1112879c0 SHA512 48e80a4f3f00b5c18f584e28836c36abd7b7f9bacb33dd90ff569dbdc0a5bf69e29d38ae2d74a9c14ee6dc3400dda91e586dd31bc11522257c2206efb3e93348 DIST telegraf-1.8.3.tar.gz 1205303 BLAKE2B 60579cca57863362cb4003f8da4326cef0d1bc4986d07d38f4b594556736ad79e0363098df41c13a2d10bbeeccce20fabcd0b07c7e187cbeecb5c561008d587e SHA512 367069b3578529307d5fa6eb14eabf78a44743d75e5df7c3860b35de212b5809c54cd1a7c791076137f60096d227774b4d5206606cd3fad08594721b4b49de4e -EBUILD telegraf-1.10.4.ebuild 1328 BLAKE2B d90230f4d99b4e3397f9ddd95d7e210894321245f8d89debc6a5b2a4b4698b418231703d4b3f651da5c67df0de63bff255dd413340e8769d582579935f993592 SHA512 d208883ac6787db14fc883cde3c68d10d34c48f0ac0b4e1f59c7167f67e9c2ccf395bca6cda9eeda4b7ecf4a3c010de1a3a42b0b69fe880a59a3efa3c22cb0e0 +EBUILD telegraf-1.10.4.ebuild 1350 BLAKE2B 4cd393ebb9c9afb4c9b381b9f9cd44c5af5c746022de949777697e75d30c69fb1b0f10db2216f4e765a26b160dbe6f65b7d60f6f1a7bf84537b60640293751ea SHA512 9ec1991dde6f6a1f88576e582b5e96e094f524c4e9b90ed3e7ab2e02cef8382b3f9573fdc48520d29099f8d7592656f65dd83c163e0c5da9cc7761869688c1fc EBUILD telegraf-1.5.3.ebuild 8161 BLAKE2B 53f9c9b2fc23e06e2d8cea9d11198fa0b8b91cd8c5721a7baaac36a300473da2b2494399f0786d9dbf022fa92093f9bf1eeb234a314ed97bdb97a48c6d6df730 SHA512 ecd1b258a0932732f4a738ef4baae5e7b7ae97eb076cc2d3ff6e824429e75b64d3c70385e843fe27daa1a09d8bb80a9977291bc8808922ea46100ab99f09e779 EBUILD telegraf-1.8.3.ebuild 10888 BLAKE2B 84331e20f7ada3e7e1882a6a0e34ba3f2d764350265dc199edefb21a247e3e89be1bb9ae216782bb8b7e0af7bb160972be8084341ef86d37c2a101d1e89d2a52 SHA512 ab279f166ad698c7547a8c26a155ac2566829a71d01654df7f8bc4a9ee5f4278e5fb79da39ffae7dac949ee1181f53eb6ba94e9e28272fd918b92ed40e60400a MISC metadata.xml 397 BLAKE2B 2a5052554a207a61b00ce3997cd42292b00aaa7a434aee3361abc24057d705c0ec82885550a0515439775fec013319c325b911684bc351f9478adf4a0b7c26d1 SHA512 e27b2a6ed4fe38df2a3ab0d70fe4e82bbe874987be1cfa26df2ff5cdfa93a1fd55b19fa6c901ea1adda058fafc703d15438bdd3119023f4da0e2fd5cc915a52e diff --git a/net-analyzer/telegraf/telegraf-1.10.4.ebuild b/net-analyzer/telegraf/telegraf-1.10.4.ebuild index 26d57829cbfc..ed1cb6058ca1 100644 --- a/net-analyzer/telegraf/telegraf-1.10.4.ebuild +++ b/net-analyzer/telegraf/telegraf-1.10.4.ebuild @@ -20,6 +20,8 @@ KEYWORDS="~amd64" RESTRICT="strip" +DEPEND="dev-lang/go" + pkg_setup() { enewgroup telegraf enewuser telegraf -1 -1 -1 telegraf diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 233ad5d23ec6..c0d570f06be9 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -10,10 +10,10 @@ AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 -DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc DIST vnstat-2.3.tar.gz 269907 BLAKE2B b935c7baec34f15213b3fe320add4e3ecf0d3cd43d5934231eb9b96f3bc8171aa056e1a08d42cafdc2d06b9e6108d04392a1452a3d24bdbaf748722c53f64f23 SHA512 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677 +DIST vnstat-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4 -EBUILD vnstat-2.2.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf EBUILD vnstat-2.3.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf +EBUILD vnstat-2.4.ebuild 1525 BLAKE2B b4a3e5bdd1c554cf7ff18528eaf02688b6d7035cd8480291ad3cd7fdc7d2b71bed7cea46bfe0f30415d1b3ce4873ebfb2f5fd0343ca93d5253ecb66adf62cd22 SHA512 cd3577efee947e7688b0b9a7768d0bf71e8f10726081fe13c335737abc939bc059fe4ce5a438ce353714b0a726e3712a05da6fa9191b24ad28790a542947c005 EBUILD vnstat-9999.ebuild 1502 BLAKE2B 85b6e903a1cd01f95b3140ff957f06f2cae8e890279fde5b89d8e478e23a9a1e96cd4db7ad31d00fe1bfb269330a367f35c24e844e3399ec44774adc1c6d80c7 SHA512 8c8644661509f62cd77319e0d445371cfbf4b9533f4e0602978103c1b7460c64a1a242a2495aeb35ac81c6b2f5898d042bfc4f0c51d544e8156f5632a2a26b02 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2 diff --git a/net-analyzer/vnstat/vnstat-2.2.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild deleted file mode 100644 index c5e123218abe..000000000000 --- a/net-analyzer/vnstat/vnstat-2.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd user - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="gd selinux test" - -COMMON_DEPEND=" - dev-db/sqlite - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${COMMON_DEPEND} - 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 -) - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /usr/share/${PN} - newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - - newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd - - systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf - - 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.4.ebuild b/net-analyzer/vnstat/vnstat-2.4.ebuild new file mode 100644 index 000000000000..158b3bde0441 --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd user + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="gd selinux test" + +COMMON_DEPEND=" + dev-db/sqlite + gd? ( media-libs/gd[png] ) +" +DEPEND=" + ${COMMON_DEPEND} + test? ( dev-libs/check ) +" +RDEPEND=" + ${COMMON_DEPEND} + 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 +) + +pkg_setup() { + enewgroup vnstat + enewuser vnstat -1 -1 /var/lib/vnstat vnstat +} + +src_compile() { + emake ${PN} ${PN}d $(usex gd ${PN}i '') +} + +src_install() { + use gd && dobin vnstati + dobin vnstat vnstatd + + exeinto /usr/share/${PN} + newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron + + insinto /etc + doins cfg/vnstat.conf + fowners root:vnstat /etc/vnstat.conf + + keepdir /var/lib/vnstat + fowners vnstat:vnstat /var/lib/vnstat + + newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd + newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd + + systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service + systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + + use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.8 + + newdoc INSTALL README.setup + dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi +} diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 791854b89309..516d7a546e00 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,22 +1,14 @@ -AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66 -AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc -AUX wireshark-2.6.6-androiddump-wsutil.patch 324 BLAKE2B f72415948a15cdfa2eae24bd2af00c64ede367007c8ee969ae76a7d391a209f47d96431a61484ac9d780111f05e2262083601a9e3ca81453b6a5a1293979021e SHA512 2b26ac08ade3ba51c53fd17db7722fd7182330bf68ac3db851b19e246f8ac808cf7f5e6a85a58d91a2566a254c4e57b14b61188e56f75e3df0028a7ae0726125 AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362 AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e -AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3 -DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d -DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9 -EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5 -EBUILD wireshark-3.0.1.ebuild 6644 BLAKE2B ec4baa9e82e85d4d4f12c8d8952fd67fc01c4452a0baa709d4dcf71313a4f01e8c711aa3735a329868b9627099872a3bb4665e6fe70a7caa84ea0fa910947c14 SHA512 9c48c6c03aa455dda7178f77c1fa32d404d36c814043b3bc71ea60437779f85c5d4af38d35599eab548d7fd856eb1227398a78629acbef2d3f9edb3fa7d05147 -EBUILD wireshark-3.0.2.ebuild 6646 BLAKE2B a83359278ffcc89e54efe7367b13e060884985bc0c4817639b1513815fc62877f6edea5224768ce75f006f569ec01fa950a2554d3048dbad7b32f51f3147c838 SHA512 7273fbcd9a25a1312979cdc244825d6c3139d9b161d396a2f1a6ac58701912228b3a380d415d36d8d37cb1295cb6c0b49f2bd73d95f28853879d4d5917e3dfd9 -EBUILD wireshark-3.0.3.ebuild 6582 BLAKE2B 903e0d9984291cf6a19d02b037ebaf81dbada4e64665800bd8411291bcb4835d4d89f167c5e4626bb7c103376c51d6504759df17c82983f9dcf61fee08c13b57 SHA512 7f6b2b4333b81835f719ce22684e0a5c0a213399b16aa41575544957376ce258de5784abf088c78347fd5bdc1e95a9482bbfe2a9a64f51fc276ab0388478b5c5 +EBUILD wireshark-3.0.1.ebuild 6603 BLAKE2B e6a553eaadb1eb0098088bc18f2603359f6b3c5c3a411d4abdc879c21e2b927362d383cdab19072f333beba35da851368263ea9fb059eb9726ea5bf6f5a969ef SHA512 33362ce11dd19ce6c93c47325907dbbea2f504724ad94464217d98744b19dad1f3461319ba709edb21ad442d22fce6db4d8fae596d1e0714520b34598bdbfcb2 +EBUILD wireshark-3.0.3.ebuild 6578 BLAKE2B 3a333b229fdb0c26aeb66221d4f578ff0b83ab1d531e2fcb9e34c1d6bc3f3b64f760ec421bfd2a8a3be9c323c7182dda8eecc8ffceb90a8815066ad2ea83ecc9 SHA512 7c69e9e51897bbea7d460be38a8ba714e01cb4e0240fbcf5a568f0b76044499d007859b71cd088fde25109b8ca2d6d884ff5d53055bcb85b4ad50f034e0c70a9 EBUILD wireshark-3.1.0.ebuild 6786 BLAKE2B 7b05213d7d7ba5b672a5f220ddf59933d32cc0a3a721794748309e7db4084ab850f7f8b7cb41ef7ae766d5aaaf15e39e29383490084c97a3f592eee8e0d06582 SHA512 df91871153094a2a3c0ab7346c6f88ae96ec1ca094585bbc7caf1640a1569f637a4b83faa27aad13a8f36eaa13563bb64c6176bdd93d4e83510e5cbd931a46a4 EBUILD wireshark-99999999.ebuild 6791 BLAKE2B 30a9e0c25a67f859feabdee9edf89b4ce04399dd0e5ab32b49555bed905d133fa6cd6c6c987d8a687a49a1f153740dc8917369ce34c0c6a0febdcaeb8348032c SHA512 ba9ee5fb66214cac558e2b4aed29760535c095b5df46ec24b02a344d414613c41b09322c8ad644ca78f27090b8d2d0e4abfb0405909c88709a2d471a624d427d MISC metadata.xml 5146 BLAKE2B f126bc073b880c4c0fac986cef21b7cd6951826df28032ec546b21f5b4472192c91cb6442f765d8e408c1ac7d725518ae316e63a931996c01724154404f879e4 SHA512 895920a9ee9a7f4587d063581b36d00c08b85d554087ddbfb6acbbbd6c066795d8b484826c50740fb4c2db5cf0058ed4d85c0082ab42f7d5e96bd96413701b69 diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch deleted file mode 100644 index 47459515ee79..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2149,7 +2149,6 @@ - # -qt={version} argument, otherwise we look for particular - # tool versions using tool name suffixes. - # -- AC_PATH_PROG(QTCHOOSER, qtchooser) - if test ! -z "$QTCHOOSER"; then - # - # We found qtchooser; we assume that means that diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch deleted file mode 100644 index 445851090a69..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -939,14 +939,12 @@ - Qt5LinguistTools - Qt5Multimedia - Qt5PrintSupport -- Qt5Svg - Qt5Widgets - ) - set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) -- set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS}) - if (APPLE) - set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras) diff --git a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch deleted file mode 100644 index 654c2c82db17..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2843,6 +2843,7 @@ - if(HAVE_LIBPCAP) - set(androiddump_LIBS - ui -+ wsutil - ${GLIB2_LIBRARIES} - ${PCAP_LIBRARIES} - ) -@@ -2853,6 +2854,7 @@ - set(androiddump_LIBS - ui - wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${ZLIB_LIBRARIES} - ${CMAKE_DL_LIBS} diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch deleted file mode 100644 index db1c560848ec..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/extcap/Makefile.am -+++ b/extcap/Makefile.am -@@ -32,6 +32,7 @@ - ../ui/libui.a \ - ../wiretap/libwiretap.la \ - ../wsutil/libwsutil.la \ -+ @PCAP_LIBS@ \ - @GLIB_LIBS@ - - randpktdump_SOURCES = \ diff --git a/net-analyzer/wireshark/wireshark-2.6.7.ebuild b/net-analyzer/wireshark/wireshark-2.6.7.ebuild deleted file mode 100644 index d947b47f07b1..000000000000 --- a/net-analyzer/wireshark/wireshark-2.6.7.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ppc64 x86" -IUSE=" - adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc - +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink - nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux - +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump - zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.14:2 - dev-libs/libgcrypt:0 - netlink? ( dev-libs/libnl:3 ) - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - filecaps? ( sys-libs/libcap ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - sshdump? ( >=net-libs/libssh-0.6 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - nghttp2? ( net-libs/nghttp2 ) - pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - dev-lang/perl - !" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-2.2.16.ebuild b/net-analyzer/zabbix/zabbix-2.2.16.ebuild deleted file mode 100644 index 16a773d14401..000000000000 --- a/net-analyzer/zabbix/zabbix-2.2.16.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - || die "econf failed" -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/2.2"/zabbix_server.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd \ - "${FILESDIR}/2.2"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_agent.conf \ - "${FILESDIR}/2.2"/zabbix_agentd.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd - dosbin \ - src/zabbix_agent/zabbix_agent \ - src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - fperms 0640 \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agent.conf \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n " - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild new file mode 100644 index 000000000000..5cf012564554 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild @@ -0,0 +1,341 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( dev-db/postgresql:* ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + xmpp? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( virtual/jdk:* ) + odbc? ( dev-db/unixODBC )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping ) + server? ( net-analyzer/fping + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + static? ( + ldap? ( + net-nds/openldap[static-libs] + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + ) + mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) + sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + curl? ( net-misc/curl[static-libs] ) + ssh? ( net-libs/libssh2[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + ) + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with xmpp jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + || die "econf failed" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/2.2"/zabbix_server.conf + doinitd "${FILESDIR}/2.2"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd \ + "${FILESDIR}/2.2"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.2"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.2"/zabbix_agent.conf \ + "${FILESDIR}/2.2"/zabbix_agentd.conf + doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd + dosbin \ + src/zabbix_agent/zabbix_agent \ + src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + fperms 0640 \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agent.conf \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + exeinto /${ZABBIXJAVA_BASE}/ + doexe \ + src/zabbix_java/settings.sh \ + src/zabbix_java/startup.sh \ + src/zabbix_java/shutdown.sh + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. " + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n " + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-2.2.21.ebuild b/net-analyzer/zabbix/zabbix-2.2.21.ebuild deleted file mode 100644 index cbd15dd4953a..000000000000 --- a/net-analyzer/zabbix/zabbix-2.2.21.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - || die "econf failed" -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/2.2"/zabbix_server.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd \ - "${FILESDIR}/2.2"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_agent.conf \ - "${FILESDIR}/2.2"/zabbix_agentd.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd - dosbin \ - src/zabbix_agent/zabbix_agent \ - src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - fperms 0640 \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agent.conf \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n " - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild new file mode 100644 index 000000000000..5cf012564554 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild @@ -0,0 +1,341 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( dev-db/postgresql:* ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + xmpp? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( virtual/jdk:* ) + odbc? ( dev-db/unixODBC )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping ) + server? ( net-analyzer/fping + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + static? ( + ldap? ( + net-nds/openldap[static-libs] + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + ) + mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) + sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + curl? ( net-misc/curl[static-libs] ) + ssh? ( net-libs/libssh2[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + ) + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with xmpp jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + || die "econf failed" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/2.2"/zabbix_server.conf + doinitd "${FILESDIR}/2.2"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd \ + "${FILESDIR}/2.2"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.2"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.2"/zabbix_agent.conf \ + "${FILESDIR}/2.2"/zabbix_agentd.conf + doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd + dosbin \ + src/zabbix_agent/zabbix_agent \ + src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + fperms 0640 \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agent.conf \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + exeinto /${ZABBIXJAVA_BASE}/ + doexe \ + src/zabbix_java/settings.sh \ + src/zabbix_java/startup.sh \ + src/zabbix_java/shutdown.sh + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. " + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n " + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-2.2.23.ebuild b/net-analyzer/zabbix/zabbix-2.2.23.ebuild deleted file mode 100644 index cbd15dd4953a..000000000000 --- a/net-analyzer/zabbix/zabbix-2.2.23.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - || die "econf failed" -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/2.2"/zabbix_server.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd \ - "${FILESDIR}/2.2"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_agent.conf \ - "${FILESDIR}/2.2"/zabbix_agentd.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd - dosbin \ - src/zabbix_agent/zabbix_agent \ - src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - fperms 0640 \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agent.conf \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n " - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild new file mode 100644 index 000000000000..39902958a7e2 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild @@ -0,0 +1,328 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( dev-db/postgresql:* ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + xmpp? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( virtual/jdk:* ) + odbc? ( dev-db/unixODBC ) + ssl? ( dev-libs/openssl:=[-bindist] )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping[suid] ) + server? ( net-analyzer/fping[suid] + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + static? ( + ldap? ( + net-nds/openldap[static-libs] + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + ) + mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) + sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + curl? ( net-misc/curl[static-libs] ) + ssh? ( net-libs/libssh2[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + ) + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with xmpp jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + $(use_with ssl openssl) \ + || die "econf failed" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_server.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy + dosbin src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_agentd.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy + doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. " + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n " + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-3.2.11.ebuild b/net-analyzer/zabbix/zabbix-3.2.11.ebuild deleted file mode 100644 index 318cb9575249..000000000000 --- a/net-analyzer/zabbix/zabbix-3.2.11.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n " - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} -- cgit v1.2.3