diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-27 18:53:03 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-27 18:53:03 +0000 |
| commit | 3482ddf943eff7b8848f1fb31350b99ce349e86a (patch) | |
| tree | 9c9bb6ec6679e9dc44a84d87ba611989409b12ca /net-analyzer | |
| parent | 8e8120eabdd28020aa69c7a60505cce2edd20adc (diff) | |
| download | baldeagleos-repo-21.1.3.tar.gz baldeagleos-repo-21.1.3.tar.xz baldeagleos-repo-21.1.3.zip | |
Updating liguros repov21.1.3
Diffstat (limited to 'net-analyzer')
40 files changed, 1340 insertions, 1582 deletions
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild index 889b70b2de49..6daaf2358a7a 100644 --- a/net-analyzer/arping/arping-2.21.ebuild +++ b/net-analyzer/arping/arping-2.21.ebuild @@ -2,9 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools fcaps -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" +DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it" HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" @@ -16,19 +17,23 @@ RESTRICT="!test? ( test )" CDEPEND=" net-libs/libpcap - net-libs/libnet:1.1 -" + net-libs/libnet:1.1" DEPEND=" ${CDEPEND} - test? ( dev-libs/check ) -" + test? ( + dev-libs/check + dev-python/subunit )" RDEPEND=" ${CDEPEND} - !net-misc/iputils[arping(+)] -" + !net-misc/iputils[arping(+)]" + FILECAPS=( cap_net_raw /usr/sbin/arping ) + S=${WORKDIR}/${PN}-${P} +# patch is in upstream master +PATCHES=( "${FILESDIR}/arping-tests.patch" ) + src_prepare() { default eautoreconf diff --git a/net-analyzer/arping/files/arping-tests.patch b/net-analyzer/arping/files/arping-tests.patch new file mode 100644 index 000000000000..fb8592df372f --- /dev/null +++ b/net-analyzer/arping/files/arping-tests.patch @@ -0,0 +1,190 @@ +diff --git a/src/arping_test.c b/src/arping_test.c +index 438670b..0133fe7 100644 +--- a/src/arping_test.c ++++ b/src/arping_test.c +@@ -40,35 +40,10 @@ extern libnet_t* libnet; + extern int mock_libnet_lo_ok; + extern int mock_libnet_null_ok; + +-struct registered_test { +- void* fn; +- const char* name; +-}; +- +-static int numtests = 0; +-static struct registered_test test_registry[1024]; +- +-static int num_exit_tests = 0; +-static struct registered_test test_exit_registry[1024]; +- + int get_mac_addr(const char *in, char *out); + void strip_newline(char* s); + + +-#define MYTEST(a) static void a(int);__attribute__((constructor)) \ +-static void cons_##a() { \ +- test_registry[numtests].fn = a; \ +- test_registry[numtests].name = #a; \ +- numtests++; \ +-} START_TEST(a) +- +-#define MY_EXIT_TEST(a) static void a(int);__attribute__((constructor)) \ +-static void cons_##a() { \ +- test_exit_registry[num_exit_tests].fn = a; \ +- test_exit_registry[num_exit_tests].name = #a; \ +- num_exit_tests++; \ +-} START_TEST(a) +- + /** + * + */ +@@ -236,7 +211,7 @@ dump_packet(uint8_t* packet, int len) + fprintf(stderr, "\n"); + } + +-MYTEST(test_mkpacket) ++START_TEST(test_mkpacket) + { + uint8_t correct_packet[] = { + 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, +@@ -261,7 +236,7 @@ MYTEST(test_mkpacket) + + + // Received uninteresting packet, should not record anything. +-MYTEST(pingip_uninteresting_packet) ++START_TEST(pingip_uninteresting_packet) + { + struct pcap_pkthdr pkthdr; + uint8_t* packet; +@@ -389,7 +364,7 @@ MYTEST(pingip_uninteresting_packet) + } END_TEST + + // Received reply that actually matches. Things should happen. +-MYTEST(pingip_interesting_packet) ++START_TEST(pingip_interesting_packet) + { + struct pcap_pkthdr pkthdr; + extern uint8_t srcmac[ETH_ALEN]; +@@ -449,7 +424,7 @@ MYTEST(pingip_interesting_packet) + "numrecvd not incremented second time"); + } END_TEST + +-MYTEST(strip_newline_test) ++START_TEST(strip_newline_test) + { + const char *tests[][2] = { + {"", ""}, +@@ -469,7 +444,7 @@ MYTEST(strip_newline_test) + } + } END_TEST + +-MYTEST(get_mac_addr_success) ++START_TEST(get_mac_addr_success) + { + const char *tests[][2] = { + // Null. +@@ -501,7 +476,7 @@ MYTEST(get_mac_addr_success) + } + } END_TEST + +-MYTEST(get_mac_addr_fail) ++START_TEST(get_mac_addr_fail) + { + const char *tests[] = { + "", +@@ -517,7 +492,7 @@ MYTEST(get_mac_addr_fail) + } + } END_TEST + +-MY_EXIT_TEST(libnet_init_bad_nolo) ++START_TEST(libnet_init_bad_nolo) + { + // It'll only try lo if named interface fails. + // So by accepting lo, we make sure it doesn't try lo. +@@ -525,27 +500,28 @@ MY_EXIT_TEST(libnet_init_bad_nolo) + do_libnet_init("bad", 0); + } END_TEST + +-MY_EXIT_TEST(libnet_init_null_nolo_nonull) ++START_TEST(libnet_init_null_nolo_nonull) + { + mock_libnet_lo_ok = 0; + mock_libnet_null_ok = 0; + do_libnet_init(NULL, 0); + } END_TEST + +-MYTEST(libnet_init_good) ++START_TEST(libnet_init_good) + { + mock_libnet_lo_ok = 0; // Don't even try falling back to lo. + do_libnet_init("good", 0); + fail_if(libnet == NULL); + } END_TEST + +-MYTEST(libnet_init_null_nolo) ++START_TEST(libnet_init_null_nolo) + { + mock_libnet_lo_ok = 0; + mock_libnet_null_ok = 1; + do_libnet_init(NULL, 0); + fail_if(libnet == NULL); +-} END_TEST ++} ++END_TEST + + static Suite* + arping_suite(void) +@@ -553,17 +529,34 @@ arping_suite(void) + int c; + Suite* s = suite_create("Arping"); + +- //tcase_add_checked_fixture (tc_core, setup, teardown); +- for (c = 0; c < numtests; c++) { +- TCase *tc_core = tcase_create(test_registry[c].name); +- tcase_add_test(tc_core, test_registry[c].fn); +- suite_add_tcase(s, tc_core); +- } +- for (c = 0; c < num_exit_tests; c++) { +- TCase *tc_core = tcase_create(test_exit_registry[c].name); +- tcase_add_exit_test(tc_core, test_exit_registry[c].fn, 1); +- suite_add_tcase(s, tc_core); +- } ++ ++ TCase *tc_core; ++ ++ // libcheck broke test registries, so have to resort to code duplication. :-( ++ // https://github.com/libcheck/check/pull/158/files ++#define SIGH_LIBCHECK(tn) \ ++ tc_core = tcase_create(#tn); \ ++ tcase_add_test(tc_core, tn); \ ++ suite_add_tcase(s, tc_core); ++ ++ SIGH_LIBCHECK(libnet_init_null_nolo); ++ SIGH_LIBCHECK(test_mkpacket); ++ SIGH_LIBCHECK(pingip_uninteresting_packet); ++ SIGH_LIBCHECK(pingip_interesting_packet); ++ SIGH_LIBCHECK(strip_newline_test); ++ SIGH_LIBCHECK(get_mac_addr_success); ++ SIGH_LIBCHECK(get_mac_addr_fail); ++ SIGH_LIBCHECK(libnet_init_good); ++ ++ ++#define SIGH_LIBCHECK_EXIT(tn) \ ++ tc_core = tcase_create(#tn); \ ++ tcase_add_exit_test(tc_core, tn, 1); \ ++ suite_add_tcase(s, tc_core); ++ ++ SIGH_LIBCHECK_EXIT(libnet_init_bad_nolo); ++ SIGH_LIBCHECK_EXIT(libnet_init_null_nolo_nonull); ++ + return s; + } + +@@ -577,6 +570,7 @@ main() + number_failed = srunner_ntests_failed (sr); + srunner_free (sr); + return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; ++ return 0; + } + /* ---- Emacs Variables ---- + * Local Variables: diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild index 8cc6d4ae0463..09cd2dec5a62 100644 --- a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild +++ b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="curl nls" RDEPEND="sys-libs/readline:0= diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index ef0ed74ed512..1d34b23f3ee5 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1,2 +1 @@ -DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056 DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35 diff --git a/net-analyzer/cacti/cacti-1.2.14.ebuild b/net-analyzer/cacti/cacti-1.2.14.ebuild deleted file mode 100644 index 2ec9213257a6..000000000000 --- a/net-analyzer/cacti/cacti-1.2.14.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils webapp - -# Support for _p* in version. -MY_P=${P/_p*/} - -DESCRIPTION="Cacti is a complete frontend to rrdtool" -HOMEPAGE="https://www.cacti.net/" -SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86" -IUSE="snmp doc" - -need_httpd - -RDEPEND=" - dev-lang/php[cli,mysql,pdo,session,sockets,xml] - dev-php/adodb - net-analyzer/rrdtool[graph] - virtual/cron - snmp? ( >=net-analyzer/net-snmp-5.2.0 ) -" - -src_compile() { :; } - -src_install() { - dodoc CHANGELOG - dodoc -r docs - mv docs .. || die - - webapp_src_preinst - - edos2unix `find -type f -name '*.php'` - - dodir ${MY_HTDOCSDIR} - cp -r . "${D}"${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR}/rra - webapp_serverowned ${MY_HTDOCSDIR}/log - webapp_configfile ${MY_HTDOCSDIR}/include/config.php - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - webapp_src_install -} diff --git a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild index 0113bd81074d..78185ebd73d0 100644 --- a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild +++ b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.cacti.net/" SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86" IUSE="snmp doc" need_httpd diff --git a/net-analyzer/cacti/cacti-1.2.16.ebuild b/net-analyzer/cacti/cacti-1.2.16.ebuild deleted file mode 100644 index 1dfa8747632d..000000000000 --- a/net-analyzer/cacti/cacti-1.2.16.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit edos2unix webapp - -# Support for _p* in version. -MY_P=${P/_p*/} - -DESCRIPTION="Cacti is a complete frontend to rrdtool" -HOMEPAGE="https://www.cacti.net/" -SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="snmp doc" - -need_httpd - -RDEPEND=" - dev-lang/php[cli,mysql,pdo,session,sockets,xml] - dev-php/adodb - net-analyzer/rrdtool[graph] - virtual/cron - snmp? ( >=net-analyzer/net-snmp-5.2.0 ) -" - -src_compile() { :; } - -src_install() { - dodoc CHANGELOG - dodoc -r docs - mv docs .. || die - - webapp_src_preinst - - edos2unix `find -type f -name '*.php'` - - dodir ${MY_HTDOCSDIR} - cp -r . "${ED}"${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR}/rra - webapp_serverowned ${MY_HTDOCSDIR}/log - webapp_configfile ${MY_HTDOCSDIR}/include/config.php - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - webapp_src_install -} diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch deleted file mode 100644 index 30ad62c38f47..000000000000 --- a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/gif.c -+++ b/gif.c -@@ -20,7 +20,12 @@ - */ - int gif_load_hdr(img I) { - GifFileType *g; -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+ g = I->us = DGifOpenFileHandle(fileno(I->fp), GifError); -+#else - g = I->us = DGifOpenFileHandle(fileno(I->fp)); -+#endif /* GIFLIB_MAJOR */ - if (!I->us) { - I->err = IE_HDRFORMAT; - return 0; -@@ -36,7 +41,12 @@ - * Abort loading a GIF file after the header is done. - */ - int gif_abort_load(img I) { -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+ DGifCloseFile((GifFileType*)I->us, GifError); -+#else - DGifCloseFile((GifFileType*)I->us); -+#endif /* GIFLIB_MAJOR */ - return 1; - } - -@@ -44,6 +54,9 @@ - * Load GIF image. - */ - int gif_load_img(img I) { -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+#endif /* GIFLIB_MAJOR */ - GifFileType *g = I->us; - struct SavedImage *si; - int ret = 0; -@@ -114,7 +127,11 @@ - ret = 1; - fail: - -+#if GIFLIB_MAJOR > 4 -+ DGifCloseFile(g, GifError); -+#else - DGifCloseFile(g); -+#endif /* GIFLIB_MAJOR */ - - return ret; - } diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest index 16c11eb444d7..d46d8a5a6353 100644 --- a/net-analyzer/greenbone-security-assistant/Manifest +++ b/net-analyzer/greenbone-security-assistant/Manifest @@ -1,4 +1,2 @@ -DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2 -DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8 DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028 DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086 diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch deleted file mode 100644 index d0fc7963a501..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/gsad/config/CMakeLists.txt 2019-07-18 20:39:10.331949702 +0300 -+++ b/gsad/config/CMakeLists.txt 2019-07-18 20:40:18.946830294 +0300 -@@ -16,27 +16,3 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - --if (NOT SYSTEMD_SERVICE_DIR) -- set (SYSTEMD_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system") --endif (NOT SYSTEMD_SERVICE_DIR) -- --if (NOT DEFAULT_CONFIG_DIR) -- set (DEFAULT_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/default") --endif (NOT DEFAULT_CONFIG_DIR) -- --if (NOT LOGROTATE_DIR) -- set (LOGROTATE_DIR "${CMAKE_INSTALL_PREFIX}/etc/logrotate.d") --endif (NOT LOGROTATE_DIR) -- --configure_file (gsad.service.in gsad.service) --configure_file (gsad.logrotate.in gsad.logrotate) -- --install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.service -- DESTINATION ${SYSTEMD_SERVICE_DIR}/) -- --install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/gsad.default -- DESTINATION ${DEFAULT_CONFIG_DIR}/ RENAME gsad) -- --install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.logrotate -- DESTINATION ${LOGROTATE_DIR}/ RENAME gsad) -- diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch deleted file mode 100644 index a318c87225e1..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -222,7 +222,7 @@ if (NOT DATADIR) - endif (NOT DATADIR) - - if (NOT GSAD_PID_DIR) -- set (GSAD_PID_DIR "${LOCALSTATEDIR}/run") -+ set (GSAD_PID_DIR "/run") - endif (NOT GSAD_PID_DIR) - - set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas") diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch deleted file mode 100644 index 19a4731db75b..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/gsa/package.json 2019-07-17 16:45:39.000000000 +0300 -+++ b/gsa/package.json 2019-07-17 22:40:31.371899489 +0300 -@@ -66,12 +66,12 @@ - "x2js": "^3.2.6" - }, - "scripts": { -- "test": "react-scripts test", -- "test:coverage": "react-scripts test --coverage --maxWorkers 2", -+ "test": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test", -+ "test:coverage": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test --coverage --maxWorkers 2", - "lint": "eslint --max-warnings 0 src", -- "start": "react-scripts start", -- "build": "react-scripts build", -- "eject": "react-scripts eject" -+ "start": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js start", -+ "build": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js build", -+ "eject": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js eject" - }, - "devDependencies": { - "@types/jest": "^24.0.12", diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch deleted file mode 100644 index c1825ba3f5db..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gsad/src/CMakeLists.txt 2019-07-21 23:07:38.375683800 +0300 -+++ a/gsad/src/CMakeLists.txt 2019-07-21 23:08:17.301651451 +0300 -@@ -175,7 +175,7 @@ - ## Install - - install (TARGETS gsad -- RUNTIME DESTINATION ${SBINDIR} -+ RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} - ARCHIVE DESTINATION ${LIBDIR}/static) - - diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch deleted file mode 100644 index 3b075951aba6..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300 -+++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300 -@@ -1116,9 +1116,6 @@ - install (FILES public/robots.txt - DESTINATION ${GSA_DEST_DIR}) - --# remove old generated files --install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)") -- - install (DIRECTORY - ${GSA_BUILD_DIR}/static - ${GSA_BUILD_DIR}/img diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch new file mode 100644 index 000000000000..f9f587c96c8c --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch @@ -0,0 +1,14 @@ +#------------------------------------------------------------------- +# compatibility with glibc 2.32 version #751592 +#------------------------------------------------------------------- +--- ./gsad/src/gsad.c 2020-05-13 09:22:13.000000000 +0200 ++++ ./gsad/src/gsad.c 2020-10-28 13:07:25.127222254 +0100 +@@ -3318,7 +3318,7 @@ + { + if (termination_signal) + { +- g_debug ("Received %s signal.\n", sys_siglist[termination_signal]); ++ g_debug ("Received %s signal.\n", strsignal(termination_signal)); + gsad_cleanup (); + /* Raise signal again, to exit with the correct return value. */ + signal (termination_signal, SIG_DFL); diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild deleted file mode 100644 index d616891de50b..000000000000 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -MY_PN="gsa" -MY_DN="gsad" -MY_NODE_N="node_modules" - -DESCRIPTION="Greenbone Security Assistant" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> ${P}-${MY_NODE_N}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras" - -DEPEND=" - dev-libs/libgcrypt:0= - dev-libs/libxslt - >=net-analyzer/gvm-libs-10.0.1 - net-libs/gnutls:= - net-libs/libmicrohttpd" - -RDEPEND=" - ${DEPEND} - ~net-analyzer/openvas-scanner-6.0.1 - >=net-analyzer/gvmd-8.0.1" - -BDEPEND=" - >=net-libs/nodejs-8.12.0 - >=sys-apps/yarn-1.15.2 - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-python/polib - sys-devel/gettext - )" - -BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" -S="${WORKDIR}/${MY_PN}-${PV}" -MY_NODE_DIR="${S}/${MY_PN}/" - -PATCHES=( - # QA fix for 8.0.0. - "${FILESDIR}/${P}-pid.patch" - # Disable yarn-fetch during compile. - "${FILESDIR}/${P}-node.patch" - # Fix react-env path for react.js. - "${FILESDIR}/${P}-reactjs.patch" - # Remove ugly uninstall-snippet that causes failing re-emerge. - "${FILESDIR}/${P}-uninstall-snippet.patch" - # Remove unnecessary install paths/files. - "${FILESDIR}/${P}-cmakelist.patch" - # Install exec. to /usr/bin instead of /usr/sbin - "${FILESDIR}/${P}-sbin.patch" -) - -src_prepare() { - cmake_src_prepare - # We will use pre-generated npm stuff. - mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules" - # Update .yarnrc accordingly. - echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed" - # QA-Fix | Remove !CLANG doxygen warnings for 8.0.1 - if use extras; then - if ! tc-is-clang; then - local f - for f in gsad/doc/*.in - do - sed -i \ - -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ - -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ - "${f}" || die "couldn't disable CLANG parsing" - done - fi - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - ) - # Add release hardening flags for 8.0.1 - append-cflags -D_FORTIFY_SOURCE=2 -fstack-protector - append-ldflags -Wl,-z,relro -Wl,-z,now - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${MY_DN}-daemon.conf" - - dodir /etc/gvm/reverse-proxy - insinto /etc/gvm/reverse-proxy - doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example" - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}" - newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" - - systemd_dounit "${FILESDIR}/${MY_DN}.service" -} diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild index 552948dc9d4f..a0621ef26527 100644 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild +++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,6 +54,8 @@ PATCHES=( "${FILESDIR}/${PN}-8.0.1-node.patch" # Remove ugly uninstall-snippet that causes failing re-emerge. "${FILESDIR}/${P}-uninstall-snippet.patch" + # Replace deprecated glibc sys_siglist with strsignal + "${FILESDIR}/${P}-glibc_siglist.patch" ) src_prepare() { diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index 04581ca8a8ba..de6f6ae1f9ba 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -1,2 +1 @@ -DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch deleted file mode 100644 index bf21acb7b01f..000000000000 --- a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/src/CMakeLists.txt 2019-07-17 17:11:52.000000000 +0300 -+++ b/src/CMakeLists.txt 2019-07-21 22:43:17.299106863 +0300 -@@ -248,12 +248,12 @@ - ## Install - - install (TARGETS ${BINARY_NAME} -- RUNTIME DESTINATION ${SBINDIR} -+ RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} - ARCHIVE DESTINATION ${LIBDIR}/static) - - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd -- DESTINATION ${SBINDIR}) -+ DESTINATION ${BINDIR}) - - if (BACKEND STREQUAL POSTGRESQL) - install (TARGETS gvm-pg-server ---- a/CMakeLists.txt 2019-07-22 11:31:13.430827400 +0300 -+++ b/CMakeLists.txt 2019-07-22 11:32:29.034765809 +0300 -@@ -571,17 +571,17 @@ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - - install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -@@ -593,13 +593,13 @@ - WORLD_READ WORLD_EXECUTE) - - install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - if (BACKEND STREQUAL SQLITE3) - install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif (BACKEND STREQUAL SQLITE3) diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch deleted file mode 100644 index 40b1e0095578..000000000000 --- a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/tools/greenbone-certdata-sync.in 2019-07-17 17:11:52.000000000 +0300 -+++ b/tools/greenbone-certdata-sync.in 2019-07-22 21:11:36.173099530 +0300 -@@ -494,13 +494,11 @@ - fi - ( - flock -n 9 -- date > $LOCK_FILE - if [ $? -eq 1 ] ; then - log_notice "Sync in progress, exiting." - exit 1 - fi - sync_certdata -- echo -n > $LOCK_FILE --) 9>$LOCK_FILE -+) - - exit 0 ---- a/tools/greenbone-scapdata-sync.in 2019-07-17 17:11:52.000000000 +0300 -+++ b/tools/greenbone-scapdata-sync.in 2019-07-22 21:12:49.193161531 +0300 -@@ -517,13 +517,11 @@ - fi - ( - flock -n 9 -- date > $LOCK_FILE - if [ $? -eq 1 ] ; then - log_notice "Sync in progress, exiting." - exit 1 - fi - sync_scapdata -- echo -n > $LOCK_FILE --) 9>$LOCK_FILE -+) - - exit 0 diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild deleted file mode 100644 index 7289dcd5f82a..000000000000 --- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras postgres sqlite" -REQUIRED_USE="|| ( postgres sqlite )" - -DEPEND=" - dev-libs/libgcrypt:0= - dev-libs/libical - >=net-analyzer/gvm-libs-10.0.1 - net-libs/gnutls:=[tools] - extras? ( app-text/xmlstarlet - dev-texlive/texlive-latexextra ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 )" - -RDEPEND=" - ${DEPEND} - ~net-analyzer/openvas-scanner-6.0.1" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-libs/libxslt - )" - -PATCHES=( - # Install exec. to /usr/bin instead of /usr/sbin - "${FILESDIR}/${P}-sbin.patch" - # Fix permissions for user gvm. - "${FILESDIR}/${P}-tmplock.patch" -) - -src_prepare() { - cmake_src_prepare - # QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1 - sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die - sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die - # QA-Fix | Remove !CLANG Doxygen warnings for 8.0.1 - if use extras; then - if ! tc-is-clang; then - local f - for f in doc/*.in - do - sed -i \ - -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ - -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ - "${f}" || die "couldn't disable CLANG parsing" - done - fi - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - ) - # Add release hardening flags for 8.0.1 - append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector - append-ldflags -Wl,-z,relro -Wl,-z,now - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - dodir /etc/gvm - insinto /etc/gvm - doins -r "${FILESDIR}"/*sync* - - dodir /etc/gvm/sysconfig - insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${PN}-daemon.conf" - - exeinto /etc/gvm - doexe "${FILESDIR}"/gvmd-startpre.sh - - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${PN}.init" "${PN}" - newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - systemd_dounit "${FILESDIR}/${PN}.service" - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm/gvmd - fowners -R gvm:gvm /var/lib/gvm -} diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch deleted file mode 100644 index 872321d41bfd..000000000000 --- a/net-analyzer/hping/files/bytesex.h.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/bytesex.h -+++ b/bytesex.h -@@ -9,11 +9,15 @@ - - #if defined(__i386__) \ - || defined(__alpha__) \ -+ || defined(__arm__) \ -+ || defined(__x86_64__) \ -+ || defined(__ia64__) \ - || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) - #define BYTE_ORDER_LITTLE_ENDIAN - #elif defined(__mc68000__) \ - || defined (__sparc__) \ - || defined (__sparc) \ -+ || defined (__hppa__) \ - || defined (__PPC__) \ - || defined (__BIG_ENDIAN__) \ - || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index a70f7885063b..e92368b9b6f6 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,3 +1 @@ -DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec SHA512 e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e -DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799 diff --git a/net-analyzer/icinga2/icinga2-2.11.6.ebuild b/net-analyzer/icinga2/icinga2-2.11.6.ebuild deleted file mode 100644 index 992301e119d3..000000000000 --- a/net-analyzer/icinga2/icinga2-2.11.6.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="https://icinga.org/icinga2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.66.0:=[context] - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-user/icinga - acct-group/icinga - acct-group/icingacmd - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) - -DLOGROTATE_HAS_SU=ON - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use mariadb ; then # same as mysql - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/run" || die "failed to remove /run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.12.1.ebuild b/net-analyzer/icinga2/icinga2-2.12.1.ebuild deleted file mode 100644 index ad2f31c9b0f3..000000000000 --- a/net-analyzer/icinga2/icinga2-2.12.1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="https://icinga.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" - -# Add accounts to DEPEND because of fowners in src_install -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.66.0:=[context] - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl:= - acct-user/icinga - acct-group/icinga - acct-group/icingacmd" -BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.35" -RDEPEND=" - ${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -PATCHES=( - # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875 - "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch" -) - -src_configure() { - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=$(usex jumbo-build) - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON - -DUSE_SYSTEMD=$(usex systemd) - -DLOGROTATE_HAS_SU=ON - -DICINGA2_LTO_BUILD=$(usex lto) - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres) - -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql || use mariadb; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/run" || die "failed to remove /run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ "${PV}" != 9999 ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${PV}" -gt "${v}"; then - elog "DB IDO schema upgrade may be required." - elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi - done - fi -} diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest index 29f988e17eb1..3c3c024854f4 100644 --- a/net-analyzer/masscan/Manifest +++ b/net-analyzer/masscan/Manifest @@ -1,3 +1,4 @@ DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88 DIST masscan-1.3.0.tar.gz 451097 BLAKE2B 1d64a80345aa18cc0fdd00b5fca6708bcabded62571887e7171f6ac9e9f77f6d9f5bcca9c0ee04f67fcdf3ead1d6b242dc5129c6c9a94e560ac5380904a5a02a SHA512 dbf489d1fb1c882873071073ef8e65723bf3b805c794a5d13dfdcea539558f049845b5bc02ada1e313729954fe7ba29be727a777937b8e4d41778c9175d13824 +DIST masscan-1.3.1.tar.gz 461128 BLAKE2B cb18c6665bdd106dd6b9d69c904d465988b0727cfb62b3845b8b68e9f0db8d2fe4dd91b6bc0eb0ddb91a143a6d0656e774fb4dd9d7b19623261f94ace3c0b3e0 SHA512 bc43b0c41313b400d55f5da2c777c94c3db31e087c87dc8dc883cd319a6eb45da1e8d7de107f52748e415d75c104c6e564f72bf8d7677c9be84e9297d02fa466 diff --git a/net-analyzer/masscan/masscan-1.3.1.ebuild b/net-analyzer/masscan/masscan-1.3.1.ebuild new file mode 100644 index 000000000000..6a290f96f458 --- /dev/null +++ b/net-analyzer/masscan/masscan-1.3.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Mass IP port scanner" +HOMEPAGE="https://github.com/robertdavidgraham/masscan" +SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3" +KEYWORDS="~amd64 ~x86" + +RDEPEND="net-libs/libpcap" + +src_prepare() { + default + + sed -i \ + -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \ + -e '/^GITVER :=/s!= .(.*!=!g' \ + -e '/^SYS/s|gcc|$(CC)|g' \ + -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \ + -e '/^CC =/d' \ + Makefile || die + + tc-export CC +} + +src_install() { + dobin bin/masscan + + insinto /etc/masscan + doins data/exclude.conf + doins "${FILESDIR}"/masscan.conf + + dodoc doc/bot.html *.md + + doman doc/masscan.8 +} diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index da9f415e224e..392317aa3cac 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -9,9 +9,9 @@ <email>dilfridge@gentoo.org</email> <name>Andreas K. Hüttel</name> </maintainer> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> + <maintainer type="person"> + <email>zlogene@gentoo.org</email> + <name>Mikle Kolyada</name> </maintainer> <use> <flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag> diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild deleted file mode 100644 index d53d3d488e57..000000000000 --- a/net-analyzer/nstats/nstats-0.4-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" -SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" -HOMEPAGE="https://trash.net/~reeler/nstats/" -LICENSE="Artistic" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( BUGS doc/TODO doc/ChangeLog ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-glibc24.patch \ - "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-tinfo.patch - - eautoreconf -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild index 7633bef5bf79..a8e6178f124f 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index 4393b479fd57..5a442b0ea2e5 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1,4 +1,2 @@ -DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6 DIST suricata-5.0.5.tar.gz 29094537 BLAKE2B c2a5897836117abe9ca39b3a03de36c4d5667d3e64dc1befd77a7b777e4191439a497e3042e6d00b80ae31c8c4f18347cb2e6833e8db5f64b31c8ab1cf557ac5 SHA512 5f26731e0a0134fdecc8e76a68a69584bacb614ba4fd56b74f27abe62ab7d80135908eeaae38c9a03101f069d83597b3c7c69000bdd2a2e6bfe87f7a98de4e16 -DIST suricata-6.0.0.tar.gz 30832555 BLAKE2B 9cea05b07520924706e961efed6a45b9ba73388a25777f43c1a90497aa00ec200bad15863b7b17b84e622c79309365596853423776da9c3d103c2a8c1126a0d2 SHA512 3c30f6f57c0e8a24992ff2b4ce8ce166d3c0d4b28c8f5e79434d04de9f2016773be01a1689fedfc9e54ff1c8bc9838206bc28f3ff2e47d60102a7016f1062ec3 DIST suricata-6.0.1.tar.gz 30460439 BLAKE2B 55a24fa2f653a0a80f51e1ab102bb7046bd1f67d60c64c139b485086f4d8e0f5db58906bc33a7b5bdb76ba37b8206ded99b08034c4c292cf16d595bcafc7acc0 SHA512 be57150afc238b6627731e4463297e67469b66241779f5af3d1bd93bfad4fde41a5371298b54a06c7c3ea324e5642753ca57900173989ac738d663a85e9c33f4 diff --git a/net-analyzer/suricata/suricata-5.0.4.ebuild b/net-analyzer/suricata/suricata-5.0.4.ebuild deleted file mode 100644 index 17a926002f21..000000000000 --- a/net-analyzer/suricata/suricata-5.0.4.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.35 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-5.0.1_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog "" - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog "" - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog "" - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog "" - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog "" - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog "" - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "" -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-5.0.5.ebuild b/net-analyzer/suricata/suricata-5.0.5-r1.ebuild index 7540971ca5b5..60efe1e13f53 100644 --- a/net-analyzer/suricata/suricata-5.0.5.ebuild +++ b/net-analyzer/suricata/suricata-5.0.5-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +LUA_COMPAT=( lua5-{1..4} luajit ) PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit autotools flag-o-matic linux-info python-single-r1 systemd +inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" HOMEPAGE="https://suricata-ids.org/" @@ -14,13 +15,13 @@ SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" +IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" + bpf? ( af-packet ) + lua? ( ${LUA_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} acct-group/suricata @@ -43,8 +44,7 @@ RDEPEND="${PYTHON_DEPS} cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) + lua? ( ${LUA_DEPS} ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) @@ -92,8 +92,6 @@ src_configure() { $(use_enable geoip) \ $(use_enable hardened gccprotect) \ $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ $(use_enable lz4) \ $(use_enable nflog) \ $(use_enable nfqueue) \ @@ -101,6 +99,13 @@ src_configure() { $(use_enable test unittests) \ "--disable-coccinelle" ) + if use lua; then + if use lua_single_target_luajit; then + myeconfargs+=( --enable-luajit ) + else + myeconfargs+=( --enable-lua ) + fi + fi if use debug; then myeconfargs+=( $(use_enable debug) ) @@ -144,7 +149,7 @@ src_install() { } pkg_postinst() { - elog "" + elog if use systemd; then elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" @@ -155,7 +160,7 @@ pkg_postinst() { else elog "The ${PN} init script expects to find the path to the configuration" elog "file as well as extra options in /etc/conf.d." - elog "" + elog elog "To create more than one ${PN} service, simply create a new .yaml file for it" elog "then create a symlink to the init script from a link called" elog "${PN}.foo - like so" @@ -164,12 +169,12 @@ pkg_postinst() { elog " cd /etc/init.d" elog " ln -s ${PN} ${PN}.foo" elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog "" + elog elog "You can create as many ${PN}.foo* services as you wish." fi if use bpf; then - elog "" + elog elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" elog "because their configuration is hard-coded. You can find the default ones in" elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" @@ -179,17 +184,19 @@ pkg_postinst() { fi if use debug; then - elog "" + elog elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" elog "You need to also ensure the FEATURES variable in make.conf contains the" elog "'nostrip' option to produce useful core dumps or back traces." fi - elog "" - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "" + elog + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To download and install an initial set of rules, run:" + elog " emerge --config =${CATEGORY}/${PF}" + fi + elog } pkg_config() { diff --git a/net-analyzer/suricata/suricata-6.0.0.ebuild b/net-analyzer/suricata/suricata-6.0.0.ebuild deleted file mode 100644 index 5b9fec221526..000000000000 --- a/net-analyzer/suricata/suricata-6.0.0.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.35 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-6.0.0_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog - if [[ -n "${REPLACING_VERSIONS}" ]]; then - ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used" - ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2." - ewarn "If you need unified2 support, please continue to use suricata-5." - else - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - fi - elog -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-6.0.1.ebuild b/net-analyzer/suricata/suricata-6.0.1.ebuild deleted file mode 100644 index 5dca96f53291..000000000000 --- a/net-analyzer/suricata/suricata-6.0.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.36 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-6.0.0_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog - if [[ -n "${REPLACING_VERSIONS}" ]]; then - ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used" - ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2." - ewarn "If you need unified2 support, please continue to use suricata-5." - else - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - fi - elog -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild index b76f75ecfc3f..515230fe1e2e 100644 --- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild +++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86" IUSE=" androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 5d89de66c67f..7b01ef70a73a 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,6 +1,9 @@ DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1 DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa +DIST zabbix-4.0.28.tar.gz 17424006 BLAKE2B f45af54d1e54ff6945f13cc684fbe0506dab4d554f65018fc30758d7b8be6814ca3661655778abb7c24dcbb241b8e6c21f0ea72a01a886392cadc917e699a957 SHA512 1f40c7316f92474beecc9470d4ad6c093a3a005180514307eb3d7aa206fa36d1a8decc20628b1fc0e62bc7a2ff0e508d694da0fe05911314de6f6d7aa726f425 DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403 +DIST zabbix-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9 DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e +DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4 diff --git a/net-analyzer/zabbix/zabbix-4.0.28.ebuild b/net-analyzer/zabbix/zabbix-4.0.28.ebuild new file mode 100644 index 000000000000..0b9b0cc693fc --- /dev/null +++ b/net-analyzer/zabbix/zabbix-4.0.28.ebuild @@ -0,0 +1,349 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + net-nds/openldap + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) + proxy? ( sys-libs/zlib ) + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( net-analyzer/fping[suid] ) + server? ( + app-admin/webapp-config + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ + $(use_with ldap) \ + $(use_with libxml2) \ + $(use_with mysql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ + $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ + $(use_with sqlite sqlite3) \ + $(use_with ssh ssh2) \ + $(use_with ssl openssl) \ + $(use_with xmpp jabber) +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + dodir "${dir}" + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-5.0.8.ebuild b/net-analyzer/zabbix/zabbix-5.0.8.ebuild new file mode 100644 index 000000000000..39cc07a3b42e --- /dev/null +++ b/net-analyzer/zabbix/zabbix-5.0.8.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + net-nds/openldap + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) + proxy? ( sys-libs/zlib ) + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( net-analyzer/fping[suid] ) + server? ( + app-admin/webapp-config + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ + $(use_with ldap) \ + $(use_with libxml2) \ + $(use_with mysql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ + $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ + $(use_with sqlite sqlite3) \ + $(use_with ssh ssh2) \ + $(use_with ssl openssl) +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + dodir "${dir}" + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-5.2.4.ebuild b/net-analyzer/zabbix/zabbix-5.2.4.ebuild new file mode 100644 index 000000000000..39cc07a3b42e --- /dev/null +++ b/net-analyzer/zabbix/zabbix-5.2.4.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + net-nds/openldap + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) + proxy? ( sys-libs/zlib ) + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( net-analyzer/fping[suid] ) + server? ( + app-admin/webapp-config + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ + $(use_with ldap) \ + $(use_with libxml2) \ + $(use_with mysql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ + $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ + $(use_with sqlite sqlite3) \ + $(use_with ssh ssh2) \ + $(use_with ssl openssl) +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + dodir "${dir}" + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} |