summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin43586 -> 43581 bytes
-rw-r--r--net-analyzer/fragroute/Manifest2
-rw-r--r--net-analyzer/fragroute/files/fragroute-1.2.6-missing-includes.patch34
-rw-r--r--net-analyzer/fragroute/fragroute-1.2.6-r5.ebuild55
-rw-r--r--net-analyzer/icinga2/Manifest4
-rw-r--r--net-analyzer/icinga2/icinga2-2.14.3.ebuild15
-rw-r--r--net-analyzer/icinga2/icinga2-9999.ebuild15
-rw-r--r--net-analyzer/nagios-core/Manifest5
-rw-r--r--net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch98
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.5.1.ebuild268
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.5.8.ebuild2
-rw-r--r--net-analyzer/nagios-plugins/Manifest4
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild2
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild121
-rw-r--r--net-analyzer/nagios/Manifest3
-rw-r--r--net-analyzer/nagios/nagios-4.5.1.ebuild14
-rw-r--r--net-analyzer/nagios/nagios-4.5.8.ebuild2
17 files changed, 109 insertions, 535 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6e3af89194a0..f03538a0d3f1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index b4c9b84cd941..72efc8c96308 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,5 +1,7 @@
AUX fragroute-1.2.6-libdir.patch 4634 BLAKE2B 71fa0052f4e9b15b8ba143fac4f2a1af8bac19dafc9ecae71056b62cf6090ea0182da0b8e7986eb90318cfd3e4e57e8ae9c3a7146dbfda1ed91595ccf14d9783 SHA512 9013a8d685a66b0c7bd051ea4a95ae45140cefc11db05a1b476c07ecdeb26e99e90bd74f19698c2e7e52d4126e0415b5c3427d8028d260860f40aa1e3f95d727
+AUX fragroute-1.2.6-missing-includes.patch 972 BLAKE2B f6bb3caf5099586aaafdb0259c79950026b4a9def7da46ceaf009d3d15f2599ddc74f7e4f260f53a7ed1ccbd3bd1d9eef167ceb5b0ddb56b2b172b62df61a239 SHA512 960d514bdd24ac1bd5b1da150f196e77571274afddda89acf831e5f49d64ccbf315c4f174a0509f7ffffb7e46dc2f86970591c1a63f01e7a4ecad650b25802d7
AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6
DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
EBUILD fragroute-1.2.6-r4.ebuild 1086 BLAKE2B 1fa32fd70460c0cb60b08f40b633e4138f4e534d0759930c445f4c22a2277d005b7c9c5bc99db8f6dc7e6edd7c562aaa0f252b6ac65259f8a6612df6d037e693 SHA512 d2d7a77d967f631eb9b0be6b08528ff394e5bc1fc86a885c6bf4c3585a728289f149da6b4f74a106db2c96971aecb97e5189f7f825c830dcba7dc18903aca464
+EBUILD fragroute-1.2.6-r5.ebuild 1037 BLAKE2B 889cef6fea23b75af1aee71e78bbc5885fd95f871ad49d6ea2d614129fc821708c7b9b73d505588a1334bd833d941ad58ad6e85a85fdc3b10b8a8d55c744fe11 SHA512 4d0bf972204c326b93732fd522e7bfe175f14a26e5d454a00680d5258fa39cae082b4f4e7928e4e3bd025ae3a59b5ac4596181fa3654d5dd437a2fc5eb2bf0ea
MISC metadata.xml 365 BLAKE2B eaccdf170ee91074f81321c0b92d1859be889b9f6431f37ffc17a4b0ec798deee1eae111fffc73459ddcd50fd9ad1dc178adb02467c22c106f0f1568579aed4f SHA512 fd734224fe70b4453e6d7e61d7b61eaf08253a4de6f6f9d8c4a5b715b85f6b74a5c406a9de1cc76729ef3c329cf678cd857bc18a0afc9a75ab9bdc5c73016c24
diff --git a/net-analyzer/fragroute/files/fragroute-1.2.6-missing-includes.patch b/net-analyzer/fragroute/files/fragroute-1.2.6-missing-includes.patch
new file mode 100644
index 000000000000..193d228e18c7
--- /dev/null
+++ b/net-analyzer/fragroute/files/fragroute-1.2.6-missing-includes.patch
@@ -0,0 +1,34 @@
+Add missing includes needed for compilation, including ones in sed
+command in previous ebuild.
+https://bugs.gentoo.org/945195
+Remove terrible hack in bget.h for ancient compilers. I wonder why they forgotten
+to put AC_C_PROTOTYPES in configure.ac... But that macro is dead and unsupported.
+--- a/bget.h
++++ b/bget.h
+@@ -4,13 +4,7 @@
+
+ */
+
+-#ifndef _
+-#ifdef PROTOTYPES
+ #define _(x) x /* If compiler knows prototypes */
+-#else
+-#define _(x) () /* It it doesn't */
+-#endif /* PROTOTYPES */
+-#endif
+
+-typedef long bufsize;
++typedef size_t bufsize;
+ void bpool _((void *buffer, bufsize len));
+
+sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
+--- a/iputil.h
++++ b/iputil.h
+@@ -1,5 +1,7 @@
+ #ifndef IPUTIL_H
+ #define IPUTIL_H
++#include <stdio.h>
++#include <stdint.h>
+
+ ssize_t inet_add_option(uint16_t eth_type, void *buf, size_t len,
+ int proto, const void *optbuf, size_t optlen);
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r5.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r5.ebuild
new file mode 100644
index 000000000000..37655c29d469
--- /dev/null
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_P="${P}-ipv6"
+
+inherit autotools
+
+DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
+HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
+SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ >=dev-libs/libdnet-1.14-r1
+ dev-libs/libevent:=
+ net-libs/libpcap
+ dev-libs/libbsd
+
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ app-alternatives/awk
+"
+DOCS=( INSTALL README TODO )
+PATCHES=(
+ "${FILESDIR}"/${P}-libdir.patch
+ "${FILESDIR}"/${P}-pcap_open.patch
+ "${FILESDIR}"/${P}-missing-includes.patch
+)
+
+src_prepare() {
+ default
+
+ # Remove broken and old files, autotools will regen needed files
+ rm *.m4 acconfig.h missing Makefile.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ DNETINC='' \
+ DNETLIB=-ldnet \
+ EVENTINC='' \
+ EVENTLIB=-levent \
+ PCAPINC='' \
+ PCAPLIB=-lpcap
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 779404e5d3eb..90a95d3c935d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,5 @@
AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
DIST icinga2-2.14.3.tar.gz 9397891 BLAKE2B 8808154d585a422d674c6384691f029fa2fe84615dc388648d948410c63c6ea30c96ba900b96f9af954654f0a65575d1875b472985733d8153bc6fc5e5ee00d5 SHA512 7285b32d353d0e68e9925a937feb922f4404557a7a72a03eb16991db207e5f8988cdbd7ca6f3871494be9e5027c70f8062c29fba88b8f0424c2548ca1b2805d6
-EBUILD icinga2-2.14.3.ebuild 3997 BLAKE2B 24b36651e6bdcdd9a4c7e8b7c446bc2fcc969cd1467ed3dab23368e8d34e1b573cbe3c726e36593a37ed7703254885375b6a584faac988b6dd15c0afc17e2033 SHA512 5a3254dd29959a1c649db413ed0fd0f417752a074788e053b7835778f8e53fd15cf2afb034ec086cb477204c2ea1d880a9d77ecf13efa009b792d440893e8e7e
-EBUILD icinga2-9999.ebuild 3903 BLAKE2B 8f0b02082ea1524ed1b9a7a54242c784e69c82f149a4456ed861896e2f368775ed69ead4132389a79a405bfc176549354391ba428ded57df32e35242dd9c4f00 SHA512 35db0e42716d39396e6c04e697125be99f6ebd36d4372821d052186171636635186114cb6046e0e720ceceb64654cd6c8e335b97b4730fd993805f204f97844a
+EBUILD icinga2-2.14.3.ebuild 3932 BLAKE2B 56c9a1775087985f0b65037864d981a8e983d4bec36d36b44cc9b876537263ff8172632885fa5fe73e0312d8eca9e9a5d3545423675fd06216d70bc25b20ad32 SHA512 dab9a37131c7811c471314101bc37a922baa28e3139a8102ebce9f7a057b94c1c72ec438a7e441d6893cee32028580a2875eacca4d26d31978742d86b0862567
+EBUILD icinga2-9999.ebuild 3838 BLAKE2B 96ca72a710f61218d4ac5b4a74623ab0464c2c60b5f3015b2e17a9475498726efda56c4cb07cdc541c18e5a8aee5810bd018f2fcf1621606fe4bdbf27c91f3ff SHA512 d5c00eaad4410af02d67266d9c1bedca6e09799296648d34e2524964fe72c1314d29f34fdbaf6313f86d2699642cf145b9627af7700870db92e53f3bfb8adb39
MISC metadata.xml 805 BLAKE2B ac15e1296a3dd24de6f1483bfaa5ef2880a07270c35ee79d7092231dbde3565f87442e31eb69014b5bc99a328bcb29e35820aa427bbbfb75973a326b67fa0d33 SHA512 7fa390ed1571200a963cdea61e420c11da0e5a6697438e275afc32987e7c11b8e4c0a84ba9891935f46b24dfa73ed8606522fc0d39a297d937c24a3e20933c60
diff --git a/net-analyzer/icinga2/icinga2-2.14.3.ebuild b/net-analyzer/icinga2/icinga2-2.14.3.ebuild
index 1ce211b79dc7..bbd4236eb875 100644
--- a/net-analyzer/icinga2/icinga2-2.14.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.14.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake systemd
+inherit cmake eapi9-ver systemd
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -134,13 +134,8 @@ src_install() {
}
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
+ if [[ "${PV}" != 9999 ]] && ver_replacing -lt "${PV}"; then
+ elog "DB IDO schema upgrade may be required."
+ elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
fi
}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index f2525a95a10b..e001d26c92ba 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake
+inherit cmake eapi9-ver
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -130,13 +130,8 @@ src_install() {
}
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
+ if [[ "${PV}" != 9999 ]] && ver_replacing -lt "${PV}"; then
+ elog "DB IDO schema upgrade may be required."
+ elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
fi
}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 221a4a3ed70b..48946e22dc74 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,9 +1,6 @@
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.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae74444aecb9555719ef29bc88fd95067d84aecca4bacf28 SHA512 71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9
DIST nagios-4.5.8.tar.gz 2587824 BLAKE2B c2f571ff7e9a525a70d6425905c5b04703ad5c9c516e36c0146d39c3ae13555f76a9a6429365f3c4cf4482f3053471b40989b81debb94d8974d0fecaf2788a7c SHA512 a293dc28638fffe944adfcf732025100550a1ab54d3a96bacebffb09a98954a9cd9fa122b4afea73b473dcf5560904d5acaa31d8ffd356b6e3b90ae37d86d4b2
DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.5.1.ebuild 9299 BLAKE2B 55ba352f224aa71b6d9cffbffd6275e38c55253b6570b12f82422897224a0c2229c38877ba17cdbbc492b58f08c06ae9b7e42ef0e4372ccdea4a8d3288417d09 SHA512 5ae0f6b5c97616dd0924a7ff4eef1889c9ece4ee79184bd27ae588aabf814d11ac786c06aaa442382889ed7693b806edfa4ffae95fe92cad21a6d889c5922499
-EBUILD nagios-core-4.5.8.ebuild 9257 BLAKE2B ae63261b3d6bf20ef3f9bd48c411aadea869ec18ee6a7d3b4cab9602059fb8a8d4c12eed9a7db12216681e77fa5dcabfc2515a712cd1c481f34bb74c589b3def SHA512 2f921063a94ff992efc95beca864d37a72529cab3f8f8dfb5b97bb278447a8162e6fee3f2d00f4df032360e043de93c2df3b8f634f4d1c800fc8ea9f6c162062
+EBUILD nagios-core-4.5.8.ebuild 9256 BLAKE2B ceadae639cf32cbcf4c29f9f5df3ad68383f9320b2695f59dbc2703cd9e2b7b3acfb18dc6975fd83563c21498c5412c14c6fda25a10f986143c06af88fc41375 SHA512 ea44e2adcf71075577635351552c349da53116a967e3eb7491ebbdc8bcf634eeec133014445aaeaa895ff5551407b9b2a0715b2df145be519334eda0b4f737c7
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
deleted file mode 100644
index eda71db9bcd4..000000000000
--- a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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
deleted file mode 100644
index d2f37b2264cc..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz
- web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-# * mod_cgi (USE=apache2_modules_cgi)
-# * mod_cgid (USE=apache2_modules_cgid)
-# * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
- acct-user/nagios
- virtual/mailx
- dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
- apache2? ( acct-group/apache )
- lighttpd? ( acct-group/lighttpd )
- web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
- ${DEPEND}
- web? (
- media-libs/gd[jpeg,png]
- lighttpd? ( www-servers/lighttpd[php] )
- apache2? (
- || (
- www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
- www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
- ( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
- || (
- dev-lang/php:*[apache2]
- dev-lang/php:*[cgi]
- dev-lang/php:*[fpm] )
- )
- )
- vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
-
-src_configure() {
- local myconf
-
- if use !apache2 && use !lighttpd ; then
- myconf="${myconf} --with-command-group=nagios"
- else
- if use apache2 ; then
- myconf="${myconf} --with-command-group=apache"
- myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
- elif use lighttpd ; then
- myconf="${myconf} --with-command-group=lighttpd"
- fi
- fi
-
- # We pass "unknown" as the init type because we don't want it to
- # guess. Later on, we'll manually install both OpenRC and systemd
- # services.
- econf ${myconf} \
- --prefix="${EPREFIX}/usr" \
- --bindir="${EPREFIX}/usr/sbin" \
- --localstatedir="${EPREFIX}/var/lib/nagios" \
- --sysconfdir="${EPREFIX}/etc/nagios" \
- --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
- --with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
- --with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
- --with-init-type="unknown"
-
- # The paths in the web server configuration files need to match
- # those passed to econf above.
- cp "${FILESDIR}/99_nagios4-r1.conf" \
- "${FILESDIR}/lighttpd_nagios4-r1.conf" \
- "${T}/" || die "failed to create copies of web server conf files"
-
- sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
- -e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
- -i "${T}/99_nagios4-r1.conf" \
- -i "${T}/lighttpd_nagios4-r1.conf" \
- || die "failed to substitute paths into web server conf files"
-
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" nagios
-
- if use web; then
- # Only compile the CGIs/HTML when USE=web is set.
- emake CC="$(tc-getCC)" cgis html
- fi
-}
-
-src_install() {
- dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
- # There is no way to install the CGIs unstripped from the top-level
- # makefile, so descend into base/ here. The empty INSTALL_OPTS
- # ensures that root:root: owns the nagios executables.
- cd "${S}/base" || die
- emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
- cd "${S}" || die
-
- # Otherwise this gets installed as 770 and you get "access denied"
- # for some reason or other when starting nagios. The permissions
- # on nagiostats are just for consistency (these should both get
- # fixed upstream).
- fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
- # INSTALL_OPTS are needed for most of install-basic, but we don't
- # want them on the LIBEXECDIR, argh.
- emake DESTDIR="${D}" install-basic
- fowners root:root /usr/$(get_libdir)/nagios/plugins
-
- # Don't make the configuration owned by the nagios user, because
- # then he can edit nagios.cfg and trick nagios into running as root
- # and doing his bidding.
- emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
- # No INSTALL_OPTS used in install-commandmode, thankfully.
- emake DESTDIR="${D}" install-commandmode
-
- # The build system installs these directories, but portage assumes
- # that the build system doesn't know what it's doing so we have to
- # keepdir them, too. I guess you'll have to manually re-check the
- # upstream build system forever to see if this is still necessary.
- keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
-
- if use web; then
- # There is no way to install the CGIs unstripped from the
- # top-level makefile, so descend into cgi/ here. The empty
- # INSTALL_OPTS ensures that root:root: owns the CGI executables.
- cd "${S}/cgi" || die
- emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
- cd "${S}" || die
-
- # install-html installs the new exfoliation theme
- emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
- if use classicui; then
- # This overwrites the already-installed exfoliation theme
- emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
- fi
-
- # Install cute Gentoo icons (bug #388323), setting their
- # owner, group, and mode to match those of the rest of Nagios's
- # images.
- insinto /usr/share/nagios/htdocs/images/logos
- doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
- fi
-
- # The ./configure script for nagios detects the init system on the
- # build host, which is wrong for all sorts of reasons. We've gone
- # to great lengths above to avoid running "install-init" -- even
- # indirectly -- and so now we must install whatever service files
- # we need by hand.
- newinitd startup/openrc-init nagios
- systemd_newunit startup/default-service nagios.service
-
- if use web ; then
- if use apache2 ; then
- # Install the Nagios configuration file for Apache.
- insinto "/etc/apache2/modules.d"
- newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
- elif use lighttpd ; then
- # Install the Nagios configuration file for Lighttpd.
- insinto /etc/lighttpd
- newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
- else
- ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
- ewarn "out of the box. Since you are not using one of them, you"
- ewarn "will have to configure your webserver yourself."
- fi
- fi
-}
-
-pkg_postinst() {
-
- if use web; then
- if use apache2 || use lighttpd ; then
- if use apache2; then
- elog "To enable the Nagios web front-end, please edit"
- elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
- elog "to APACHE2_OPTS. Then Nagios will be available at,"
- elog
- elif use lighttpd; then
- elog "To enable the Nagios web front-end, please add"
- elog "'include \"nagios.conf\"' to the lighttpd configuration"
- elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
- elog "will be available at,"
- elog
- fi
-
- elog " http://localhost/nagios/"
- fi
- fi
-
- elog
- elog "If your kernel has /proc protection, nagios"
- elog "will not be happy as it relies on accessing the proc"
- elog "filesystem. You can fix this by adding nagios into"
- elog "the group wheel, but this is not recomended."
- elog
-
- if [ -n "${REPLACING_VERSIONS}" ]; then
- ewarn "The local state directory for nagios has changed in v4.4.5,"
- ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
- ewarn "wish to migrate your state to the new location, first stop"
- ewarn "nagios and then run"
- ewarn ""
- ewarn " diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
- ewarn ""
- ewarn "to identify any files that should be moved to the new"
- ewarn "location. They can simply be moved with \"mv\" before"
- ewarn "restarting nagios."
- fi
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild
index 5898db53f9c4..c4368d17a150 100644
--- a/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
IUSE="apache2 classicui lighttpd +web vim-syntax"
# In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 9a59f5265fcc..a26eb689ccfc 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,5 +1,3 @@
DIST nagios-plugins-2.4.12.tar.gz 2752829 BLAKE2B b72b9350e9c72c9cbe0cbca3effce16ec753887945455a1ac47975105e68f516923020cc88ee42da0c8cd815fe841a82ff5053c3ba5688888bec7be12c08fb8c SHA512 fbff697d0cea1cbeb83737f240a42c00e18bf443b8af303b5d7f7f735eb6faa5305d8740fb27472876dc1398735204e0d7a0e5863c2064ec2a37541253f91502
-DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43
-EBUILD nagios-plugins-2.4.12.ebuild 3278 BLAKE2B 3de79e14c92dac5aa42b3077ba57a33b70c5b874253b34da429a4801d6c15177af7468ea4d40ddce732334742b680633cd46cb363e3ef1f9ba5f675be62dd02e SHA512 bcccbd4fbd469e634fb60cb407d3cf17db9e539407994a1bf75d7f2ef33964c1e16c5bd3698e2d8e73c5a2c737ce700f056f0e2e99f60175382a2570b7ca4ae5
-EBUILD nagios-plugins-2.4.6.ebuild 3277 BLAKE2B a11fda621ca3b455586550f55704ff0eb0880cf244d566c5cb7cf76e011a22358d3c1bad8994bbbf754a4b3d33239790f262800e353dbf2a6059ce43423c623a SHA512 7a57cb998ed1b1021a008c5f54a9233fab73058b86547d3e18c610aa528cab2899b90270a232d4d328e4ce2b3124dc00c49d6f636d47f1326854eaf937715a0b
+EBUILD nagios-plugins-2.4.12.ebuild 3277 BLAKE2B f9f479063baac76d00832adea82eee0d2e337d63a2e7b996d9d0f29bdcf9a103b8fa282ce7a2fb8139e8259449163582132b5ce02923b1de433f0200e153af26 SHA512 1252d0565d4c24fb6a109a526abc283f4e0f304b1d046f535182539ff8e5116851e3b87392ccb038489121de5b4e3fce7da41e730abd420bd585ef26d1dae900
MISC metadata.xml 1569 BLAKE2B 4ebfd50870acac360fa2708dba05d3ea925e7d93444da82ca93067b4c8eeb177e8055cba4d12d690c8d9e1f5448447d6bf94a5991a09d0f4a2ee6126338bb707 SHA512 fffa8c7bc36e0cfd4ca35ab8c8f327749e0c6744a9567d9a6c88180c178a2a5bbf67df31b289d9319bc725d2fab4433a9d00443a87d0950777ed0c05031da193
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
index a10fd4c426e3..8723db477bd1 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
# Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
deleted file mode 100644
index e7c725947880..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Official plugins for Nagios"
-HOMEPAGE="https://nagios-plugins.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
-IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-AUTOMAGIC_DEPEND="
- nagios-dns? ( net-dns/bind-tools )
- nagios-game? ( games-util/qstat )
- nagios-ping? ( net-analyzer/fping )
- samba? ( net-fs/samba )
- ssh? ( virtual/openssh )
- snmp? ( dev-perl/Net-SNMP
- net-analyzer/net-snmp[-minimal] )"
-
-# Perl really needs to run during the build...
-BDEPEND="${AUTOMAGIC_DEPEND}
- dev-lang/perl"
-
-DEPEND="
- ldap? ( net-nds/openldap:= )
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:* )
- ssl? (
- dev-libs/openssl:0=
- )
- radius? ( net-dialup/freeradius-client )"
-
-# Basically everything in net-analyzer/monitoring-plugins collides with
-# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
-RDEPEND="${BDEPEND}
- ${DEPEND}
- !net-analyzer/monitoring-plugins
- selinux? ( sec-policy/selinux-nagios )"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-DOCS=(
- ACKNOWLEDGEMENTS
- AUTHORS
- CODING
- ChangeLog
- FAQ
- NEWS
- README
- REQUIREMENTS
- SUPPORT
- THANKS
-)
-
-# These all come from gnulib and the ./configure checks are working as
-# intended when the functions aren't present. Bugs 907755 and 924341.
-QA_CONFIG_IMPL_DECL_SKIP=(
- statvfs64
- re_set_syntax
- re_compile_pattern
- re_search
- re_match
-)
-
-src_prepare() {
- default
-
- # Fix the path to our perl interpreter
- sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
- "${S}"/plugins-scripts/*.pl \
- || die 'failed to fix perl interpreter path'
-}
-
-src_configure() {
- # Use an array to prevent econf from mangling the ping args.
- local myconf=()
-
- if use ssl; then
- myconf+=( $(use_with ssl openssl /usr) )
- else
- myconf+=( --without-openssl )
- myconf+=( --without-gnutls )
- fi
-
- # The autodetection for these two commands can hang if localhost is
- # down or ICMP traffic is filtered (bug #468296). But also the path
- # likes to move around on us (bug #883765).
- myconf+=( --with-ping-command="$(command -v ping) -n -U -w %d -c %d %s" )
-
- if use ipv6; then
- myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" )
- fi
-
- econf \
- $(use_with mysql) \
- $(use_with ipv6) \
- $(use_with ldap) \
- $(use_with postgres pgsql /usr) \
- $(use_with radius) \
- "${myconf[@]}" \
- --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
- --sysconfdir="/etc/nagios"
-}
-
-pkg_postinst() {
- elog "This ebuild has a number of USE flags that determine what you"
- elog "are able to monitor. Depending on what you want to monitor, some"
- elog "or all of these USE flags need to be set."
- elog
- elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index a71d2c0a185b..263cfbdc8529 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,2 @@
-EBUILD nagios-4.5.1.ebuild 385 BLAKE2B 7bd4c6bf8923bc84e62a4d5394fe61279dad0f2f5c0daf693387cfd81b73d4ce29b6517cf71489d0727183ac58acddb7b7665bce38db15d7ce7a3aad5756510c SHA512 c7c25426e1e13ec3702d4e5378d540e8e72232b37e0ec09f7bca0a04430f6e7b0caa8ed3b6a12dc831b037e7ccabc64cbf64b062ab7d2c880d5dc70886c49340
-EBUILD nagios-4.5.8.ebuild 386 BLAKE2B 904944bfe8e36fafa5bafeb81bf1f8c13b83854e8049e5ba99bf6203051f88fe14e324bd9b806f37937477008028afc05d1b7365199264c38aa43d7ef850fe1d SHA512 df4e54faf3fa3037070d27d055ba6994d0512a8278fc6698954d922349a225c3d79f976986a9d615389b1c8b15d9ebb5cb982e525663c80843dda50dcd6f04b8
+EBUILD nagios-4.5.8.ebuild 385 BLAKE2B 55ef64118d68149f1d73ea9b3b8f629472a5e48f91f679d29a5f33297844a7a0993de495c96e9855578dacda56c40772d98da0d0640c8e4765ac4c2b3cfe89ec SHA512 a178fe0608d7a0e6c195c7f3966a0bdacc13b7de18137d69f2065180cd97da975688676ae5f16a7f888cf3f80611890ab9c2b52e3e05d2ccd64ef5b7a6548fff
MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.5.1.ebuild b/net-analyzer/nagios/nagios-4.5.1.ebuild
deleted file mode 100644
index 5a74cb50541d..000000000000
--- a/net-analyzer/nagios/nagios-4.5.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
- || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagios/nagios-4.5.8.ebuild b/net-analyzer/nagios/nagios-4.5.8.ebuild
index 02d4a2e6f761..f0fbf6baea2f 100644
--- a/net-analyzer/nagios/nagios-4.5.8.ebuild
+++ b/net-analyzer/nagios/nagios-4.5.8.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
RDEPEND="~net-analyzer/nagios-core-${PV}
|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"