diff options
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/Manifest.gz | bin | 43602 -> 43612 bytes | |||
| -rw-r--r-- | net-analyzer/nagios-core/Manifest | 3 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch | 98 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-4.5.1.ebuild | 2 | ||||
| -rw-r--r-- | net-analyzer/netdata/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/netdata/netdata-1.45.2.ebuild | 155 |
6 files changed, 259 insertions, 1 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex d4079ae5c7c2..6b59e1b98f82 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 3fa22ae74798..2054a05e9e0f 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,8 +1,9 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f +AUX nagios-core-4.5.1-musl.patch 2787 BLAKE2B 94e157cdb152ca609d29fd3b5e82d243693a5588337637e61723e3de78aca0238b189fc9a9ed38c46b8ff3b40ba053c84d9f4b1f56002aa81ac3a5a3527f7032 SHA512 904dc637909446d96c2f2f5552c57699c4cd3faf66e06bef9174cdd0dec1432e57fa38eb710f767dfd85fa57f4c5ded6fe14f01a28ec8ed856e2ae628cc1e1c0 DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1 SHA512 dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641 DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae74444aecb9555719ef29bc88fd95067d84aecca4bacf28 SHA512 71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 EBUILD nagios-core-4.4.14.ebuild 9243 BLAKE2B 2fd8690fb48a0a0456f3a1e0e01ba69a70d773cfd1783960fe9bc87a50e47b8a1b52b33d26b53613b55d8917f87a5d68f9820386822ddbb6703fb25054d20252 SHA512 7d723863dc194388097789f928316c8c303298889e79700949087bd478afa8ea5b1d278ac3b6be9a118a8c6481fb32fe1a93c7ce5913e003cb3b4fa74c1ef32e -EBUILD nagios-core-4.5.1.ebuild 9247 BLAKE2B 30d8e9e805cb4733dc93eef751cd34ede96fdad4348d88ad7e9bc2cfcb8a69131d817786dee49027c4929ea772053ff0e9173d115bab81a9657d8f4080894105 SHA512 02801161e297a562a12749c73b6063a9d7ed1a45352f427c0d3e4b9ab1c9500a0f343990512ff0e6af7fe9110a5923419f2a0e3411ce8c06e7af3d96eba16b60 +EBUILD nagios-core-4.5.1.ebuild 9290 BLAKE2B a5fcb36eb4866897e08b166825db869d57e63cf7f1173e56afe65f4f169d94ee61674e5e5232ee56b73ae612082e37aabaa659d512f39156023e65d3dccc49cf SHA512 2dfaa2e40b4ea2aa3b53780dbddb512a2823703a68c6a4d2ba250a269899bf0fdae370ffe428cd50c64fc2720eabc2d9558eee3f9624730c01fdfadf64aa0eca MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd diff --git a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch new file mode 100644 index 000000000000..eda71db9bcd4 --- /dev/null +++ b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch @@ -0,0 +1,98 @@ +From 19602faf7111203b748a4dc9ccaf3111586a8e96 Mon Sep 17 00:00:00 2001 +From: Sebastian Wolf <swolf@nagios.com> +Date: Fri, 29 Mar 2024 17:01:52 -0400 +Subject: [PATCH 1/2] Fix #952 - s/uint/unsigned int/g + +--- + Changelog | 4 ++++ + lib/t-utils.c | 10 +++++----- + lib/test-dkhash.c | 2 +- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/Changelog b/Changelog +index ec3cd64fc..fcf4742f2 100644 +--- a/Changelog ++++ b/Changelog +@@ -2,6 +2,10 @@ + Nagios Core 4 Change Log + ######################## + ++4.5.2 - 2024-04-30 ++------------------ ++* Fix build when compiling against musl libc (#952) (Sebastian Wolf) ++ + 4.5.1 - 2024-02-28 + ------------------- + * Fix text rendering in Configuration -> Command Expansion when the command ends in whitespace (Thanks Joran LEREEC for reporting this issue) (Dylan Anderson) +diff --git a/lib/t-utils.c b/lib/t-utils.c +index badab7c03..123f114c8 100644 +--- a/lib/t-utils.c ++++ b/lib/t-utils.c +@@ -1,8 +1,8 @@ + #include "t-utils.h" + + const char *cyan = "", *red = "", *green = "", *yellow = "", *reset = ""; +-uint passed, failed, t_verbose = 0; +-static uint t_depth; ++unsigned int passed, failed, t_verbose = 0; ++static unsigned int t_depth; + static const char *indent_str = " "; + + /* can't be used when a or b has side-effects, but we don't care here */ +@@ -27,9 +27,9 @@ void t_set_colors(int force) + } + } + +-static void t_indent(uint depth) ++static void t_indent(unsigned int depth) + { +- uint i; ++ unsigned int i; + for (i = 0; i < depth; i++) { + printf("%s", indent_str); + } +@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) + return TEST_FAIL; + } + +-int ok_uint(uint a, uint b, const char *name) ++int ok_unsigned int(unsigned int a, unsigned int b, const char *name) + { + if (a == b) { + t_pass("%s", name); +diff --git a/lib/test-dkhash.c b/lib/test-dkhash.c +index 6db1d7a92..15c2b676c 100644 +--- a/lib/test-dkhash.c ++++ b/lib/test-dkhash.c +@@ -68,7 +68,7 @@ static struct test_data *ddup(int x, int i, int j) + } + + struct dkhash_check { +- uint entries, count, max, added, removed; ++ unsigned int entries, count, max, added, removed; + int ent_delta, addrm_delta; + }; + + +From c4f56318e6ecfab85d592ea302d747c80be5f557 Mon Sep 17 00:00:00 2001 +From: Sebastian Wolf <swolf@nagios.com> +Date: Fri, 29 Mar 2024 17:04:29 -0400 +Subject: [PATCH 2/2] derp + +--- + lib/t-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/t-utils.c b/lib/t-utils.c +index 123f114c8..24098655f 100644 +--- a/lib/t-utils.c ++++ b/lib/t-utils.c +@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) + return TEST_FAIL; + } + +-int ok_unsigned int(unsigned int a, unsigned int b, const char *name) ++int ok_uint(unsigned int a, unsigned int b, const char *name) + { + if (a == b) { + t_pass("%s", name); diff --git a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild index 8e54a1b53013..968007cec951 100644 --- a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild @@ -90,6 +90,8 @@ RDEPEND="${CONFIGURE_DEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}/${P}-musl.patch" ) + src_configure() { local myconf diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 2daac79a6ee8..3bebdc0e6ef6 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -2,8 +2,10 @@ AUX netdata-1.44.0-dbengine.patch 1703 BLAKE2B 50af2960a6bf44361a5d9a0bd916c6909 DIST netdata-1.44.0.tar.gz 47423685 BLAKE2B 2b430d07abed1e49c5b7a3c24188446e929301eecc849d03ee9c33860f13942dbc06453401d166195b1aadd16e28e19b7533d16fc10e6f3eca51117b52485a85 SHA512 ef3534351504385ac33e18917a839c6506c377a4f25246d8819da916c6e46ae3d2d6f5422e8a685fd3aabbf851829233943abce8a8aeba0ce94db011ed406602 DIST netdata-1.45.0.tar.gz 74873918 BLAKE2B c7b255b25e48f3594c652f69b80a9b18ea836dfb11d1e82606240a83baf4d62d1f14a718e933f3c9455333971c9a5dac8b48f3cebd0bfcc52b0cb91a34af7920 SHA512 d6e3b3def40995fb25afc5cb6e6ce83b7f6a33e095351f16bf8a5279196638b62a2b4175cb513a262eb2b6981952c129c58302ecf6b9d0d720fb7e0f27d43d29 DIST netdata-1.45.1.tar.gz 74875031 BLAKE2B 9d1f912288f316f2a08bb2d91b99a5e401107d27d8ff795806e93142a6f0dbaefdab9d0bef4a4790a4d3ab3c5820e5dd16e175543c1dcdbf5d010dfb68811eeb SHA512 f658f40084d2b7accbcfe59b853bb63f2701b65358ca29eff354447819eeff9309fde207b49bff1b02c9d8f23fa4ec74269bbd083840d6d3ac0e657600952f83 +DIST netdata-1.45.2.tar.gz 74879267 BLAKE2B 7dc697657dc1e418bf826ba655544775df10a99f9461d5e13834269f897f6171f417145d904434259bb42c9adcc905170c9bbe1e3284253436ea4179f9aebf45 SHA512 40eea96b15828e44acf85e8de14619560eb59f4eb0a180156a2257c1f9ef3da52516d82a794db255c9d627a89b1c419ea51bd6b091a91bfdaa2f73ec239b4905 EBUILD netdata-1.44.0.ebuild 4211 BLAKE2B 7221dc851b930b76f7a90b8062025ee723fe5bff7f64a69afe3e857136d2277a0b0c51b516861b26848df9bd1fe9a0a12dc5c078a814e8c16bc42f63fa03641f SHA512 1d9249bbeddb683e00e2a0116e8452eaa62ca2fbcf78b38f89771e030cb6acd6e34bd610936018b2c63f643ecc425a20f4d30acd57d2b45a8c599086fb5a26a7 EBUILD netdata-1.45.0.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da EBUILD netdata-1.45.1.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da +EBUILD netdata-1.45.2.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da EBUILD netdata-9999.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da MISC metadata.xml 1512 BLAKE2B 321d3c1be16a0fd3c64d89f96c510d68ea82fca12730183d2724f7a0f30fdcb94c2be2749a6f9651ae7effdf7c250e977f95cf03c865a20e03e136456429c2b3 SHA512 4bd5583efd1fee4a0f221708fedf6dcf424639852842c8ba1089a2303a57ae58ccfd302fc5fcbfdada65a56efa8c7c949b95eedde0133a770ef68ca6688bbefd diff --git a/net-analyzer/netdata/netdata-1.45.2.ebuild b/net-analyzer/netdata/netdata-1.45.2.ebuild new file mode 100644 index 000000000000..2d2fe2aeb560 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.45.2.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10,3_11} ) + +inherit cmake fcaps linux-info optfeature python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-libs/libwebsockets + net-misc/curl + net-misc/wget + sys-apps/util-linux + app-alternatives/awk + sys-libs/libcap + cups? ( net-print/cups ) + app-arch/lz4:= + app-arch/zstd:= + app-arch/brotli:= + dbengine? ( + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libpcre2:= + dev-libs/libuv:= + dev-libs/libyaml + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) + sys-libs/zlib + ipmi? ( sys-libs/freeipmi ) + dev-libs/json-c:= + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl:= + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + app-arch/snappy:= + dev-libs/protobuf:= + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' + 'usr/libexec/netdata/plugins.d/apps.plugin' + 'usr/libexec/netdata/plugins.d/debugfs.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DCMAKE_INSTALL_PREFIX=/ + -DENABLE_ACLK=$(usex aclk) + -DENABLE_CLOUD=$(usex cloud) + -DENABLE_DBENGINE=$(usex dbengine) + -DENABLE_PLUGIN_CUPS=$(usex cups) + -DENABLE_PLUGIN_NFACCT=$(usex nfacct) + -DENABLE_PLUGIN_FREEIPMI=$(usex ipmi) + -DENABLE_EXPORTER_MONGODB=$(usex mongodb) + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus) + -DENABLE_PLUGIN_XENSTAT=$(usex xen) + -DENABLE_PLUGIN_EBPF=$(usex bpf) + -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -rf "${D}/var/cache" || die + rm -rf "${D}/var/run" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + keepdir /var/lib/netdata/cloud.d + fowners -Rc netdata:netdata /var/lib/netdata + + newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}" + newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}" + systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service" + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer" + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use nfacct ; then + fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin' + fi + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi + + if use ipmi ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin' + fi + + optfeature "go.d external plugin" net-analyzer/netdata-go-plugin +} |