From 896d6a8a88861c42b5d531a2f147c8a29a149bd8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 1 Dec 2022 20:53:45 +0000 Subject: gentoo auto-resync : 01:12:2022 - 20:53:45 --- net-analyzer/Manifest.gz | Bin 44884 -> 44883 bytes net-analyzer/argus-clients/Manifest | 6 +- .../argus-clients/argus-clients-3.0.8.4.ebuild | 76 ++++++++++ .../argus-clients-3.0.8.3-configure-clang16.patch | 41 ++++++ .../argus-clients-3.0.8.4-autoconf-2.70.patch | 55 +++++++ net-analyzer/argus-clients/metadata.xml | 16 ++- net-analyzer/argus/Manifest | 5 +- net-analyzer/argus/argus-3.0.8.3-r1.ebuild | 90 ------------ net-analyzer/argus/argus-3.0.8.3-r2.ebuild | 91 ++++++++++++ .../files/argus-3.0.8.3-configure-clang16.patch | 41 ++++++ net-analyzer/argus/metadata.xml | 11 +- net-analyzer/monitoring-plugins/Manifest | 5 +- .../monitoring-plugins-2.3.1-r2.ebuild | 106 -------------- .../monitoring-plugins-2.3.1-r3.ebuild | 108 -------------- .../monitoring-plugins-2.3.1-r4.ebuild | 109 ++++++++++++++ .../monitoring-plugins-2.3.2-r1.ebuild | 105 ++++++++++++++ .../monitoring-plugins-2.3.2.ebuild | 104 -------------- net-analyzer/nagios-plugins/Manifest | 4 +- .../nagios-plugins/nagios-plugins-2.4.0-r2.ebuild | 115 +++++++++++++++ .../nagios-plugins/nagios-plugins-2.4.0.ebuild | 114 --------------- .../nagios-plugins/nagios-plugins-2.4.2-r2.ebuild | 111 ++++++++++++++ .../nagios-plugins/nagios-plugins-2.4.2.ebuild | 110 -------------- net-analyzer/netdata/Manifest | 2 + net-analyzer/netdata/netdata-1.37.0.ebuild | 159 +++++++++++++++++++++ net-analyzer/wtfis/Manifest | 2 + net-analyzer/wtfis/wtfis-0.5.0.ebuild | 38 +++++ 26 files changed, 974 insertions(+), 650 deletions(-) create mode 100644 net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild create mode 100644 net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch create mode 100644 net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch delete mode 100644 net-analyzer/argus/argus-3.0.8.3-r1.ebuild create mode 100644 net-analyzer/argus/argus-3.0.8.3-r2.ebuild create mode 100644 net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch delete mode 100644 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild delete mode 100644 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild create mode 100644 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild create mode 100644 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild delete mode 100644 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild create mode 100644 net-analyzer/netdata/netdata-1.37.0.ebuild create mode 100644 net-analyzer/wtfis/wtfis-0.5.0.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index a20f9d3c2153..401e5af5505d 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index 558d1120fcbb..100e062f21c6 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -3,6 +3,10 @@ AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770 AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5 +AUX argus-clients-3.0.8.3-configure-clang16.patch 1231 BLAKE2B db60b5a763e4399f17804f0b31bc7b6a14d3ef6c8a175c92c561a286653b4c8f96f5248d3f7de03c09b856c1aac29590c1ff15e0ed9e39ea0d3403fd2a882baa SHA512 a4c487c6c28ce1abafcdb188b427bf64efb983bfc3f6860588526be9b5c38285a5a0fb86c79ce1222ad069fe8bb2e7d961e371273d926ddbf32cb226a7325cde +AUX argus-clients-3.0.8.4-autoconf-2.70.patch 1991 BLAKE2B a427573acefd042e7a1b4971a79cad08c79ffe94c4ff3f8583ffa3ea3180d920a001023a6a80df8293c8bbaa3cb16f50b0b508cb92c383ef044971d5b6cc2ccf SHA512 2ba0048229a695d72eeb9662fe7bc368ab21897b8092f6aeeac923fc4e484d1eef5fa2e5b19449a74755626989127c0461dd65f84957e17581303dd418c9667f DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e +DIST argus-clients-3.0.8.4.tar.gz 2773840 BLAKE2B 0b5a24bc6a5c3163a0ac19a3a354e6573491e130c4b854bc4c9b19e6dfa1d27acea8338a88e589043b839994182756b04e205d9ef6815b2f7dc347fb51405c88 SHA512 5b6a03528c31b534d56370b4b8189d223691bb0d8f465349e7850bf54b4663e9851bddb54060a8bc263be3b80f4eab829413a7ff4da312e6640e2f7191d65473 EBUILD argus-clients-3.0.8.3.ebuild 1515 BLAKE2B 0f57ac0135c8f41a205a91f4f58c7eeea3fc08fd6458b456716f24ad1c9673e00cb222f182115a7c67f47dd4becd114c48140dea4c604aee9399d8216f27835c SHA512 94cd545aca182702e25b29774bbb7cd191a96e709ad882a8434a2b09b482496d7865938c82006f6473a27b2c3771a5816868c1e58d3c112ca32ab9103e8b6d5d -MISC metadata.xml 384 BLAKE2B 9752e5335c1ac3c965dd32dd18738a69be73caa8a055a424c14ede4ee077b6084dc9f8cc3d0908c13ed9dc3ce26cdb1b2335634ead4594c12d242424ad43b30a SHA512 251db762aa813d4037eb8e7617efcfceb46eeec6be6cfbb755146cea3edbebb7e4bc5eeb0d38314ae5ca3a2311ccd96750e4c9d43692f9d89cc7bc57ec2152b6 +EBUILD argus-clients-3.0.8.4.ebuild 1659 BLAKE2B a364e5c04e4bda9a0b8e34e4effc8ad641df8d72f9032dac1a1873dde23776212d89cb15675fb5173658971741f4d6a0a5ba205a35e9060bc42a93647a65d5cb SHA512 3d0da7c36f9b37aa91164dbb03af40e464d33ca077286a6e1b14aa7738309af6b202bc0bcba7c22f96a7745dbda815537f01325bba3f5e989f58e7ebbaf09e27 +MISC metadata.xml 478 BLAKE2B cf272a8304aac515a3d31880a655e5d3425df1977666466f9589981d0b4add05f5a7b263a39ab2d1eb3b7099e07db0e0a518088e709521c52dde4ad45d8cd21c SHA512 bc5f2c51bbddbdbab7e4737e699c9f71ba43f342a164726bbde48f31de83ef124d8b303491a2bf4f440b58e7a2fbcbca1f6ff2b3d0c2fcef9f48d5033585d727 diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild new file mode 100644 index 000000000000..e3762e93f9bc --- /dev/null +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Clients for net-analyzer/argus" +HOMEPAGE="https://openargus.org/" +SRC_URI="https://github.com/openargus/clients/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/clients-${PV} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug ft geoip mysql sasl tcpd" + +RDEPEND=" + net-analyzer/rrdtool[perl] + net-libs/libpcap + net-libs/libtirpc:= + sys-libs/ncurses:= + sys-libs/readline:= + sys-libs/zlib + ft? ( net-analyzer/flow-tools ) + geoip? ( dev-libs/geoip ) + mysql? ( dev-db/mysql-connector-c:0= ) + sasl? ( dev-libs/cyrus-sasl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-ar.patch + "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch + "${FILESDIR}"/${PN}-3.0.8.3-configure-clang16.patch + "${FILESDIR}"/${PN}-3.0.8.4-autoconf-2.70.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + tc-export AR RANLIB + + use debug && touch .debug + econf \ + $(use_with ft libft) \ + $(use_with geoip GeoIP /usr/) \ + $(use_with sasl) \ + $(use_with tcpd wrappers) \ + $(use_with mysql mysql /usr) +} + +src_compile() { + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + RANLIB="$(tc-getRANLIB)" \ + CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" +} + +src_install() { + dobin bin/ra* + dodoc ChangeLog CREDITS README CHANGES + doman man/man{1,5}/* +} diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch new file mode 100644 index 000000000000..ac974dbdf395 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch @@ -0,0 +1,41 @@ +https://github.com/openargus/clients/pull/7 + +From 00264608bad9655d72927f31a2b2744b5e2e2e31 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 25 Nov 2022 19:03:24 +0100 +Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function + decls + +Implicit function declarations were removed from the C language +in 1999. Include the relevant header files to ensure that the +check still works with future compilers. C99 also requires +to declare the return types of all functions. +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include + # include + # include ++# include ++# include + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +--- a/configure ++++ b/configure +@@ -6711,8 +6711,10 @@ else + # include + # include + # include ++# include ++# include + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch new file mode 100644 index 000000000000..b6a322fb6913 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch @@ -0,0 +1,55 @@ +https://sources.debian.org/patches/argus-clients/1:3.0.8.2-6.1/0007-Fix-autoconf-2.70-build.patch/ +https://bugs.gentoo.org/808861 + +From: Boyuan Yang +Date: Fri, 1 Oct 2021 16:13:38 -0400 +Subject: Fix autoconf 2.70 build + +Bug-Debian: https://bugs.debian.org/978769 +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -715,13 +715,13 @@ AC_DEFUN([AC_QOSIENT_READLINE], [ + esac + fi + +- AC_CHECK_HEADERS(readline/readline.h, +- AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , +- [ ++ AC_CHECK_HEADERS([readline/readline.h], ++ [AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , ++ [[ + #include + #include + #include +- ]), ac_cv_found_readline=no) ++ ]])], [ac_cv_found_readline=no]) + + if test "$ac_cv_found_readline" != no; then + $1="-lreadline" +--- a/configure.ac ++++ b/configure.ac +@@ -41,17 +41,17 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_YACC + +-AC_CHECK_PROGS(V_RANLIB, ranlib, @true) +-AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) ++AC_CHECK_PROGS([V_RANLIB], [ranlib], [@true]) ++AC_QOSIENT_LEX_AND_YACC([V_LEX], [V_YACC], [argus_]) + + # Checks for libraries. +-AC_QOSIENT_READLINE(V_READLINE, V_INCLS) ++AC_QOSIENT_READLINE([V_READLINE], [V_INCLS]) + +-CMU_SASL2(V_INCLS) ++CMU_SASL2([V_INCLS]) + AC_CMU_MYSQL + +-AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, uncompress, ZLIB="-lz")]) +-AC_QOSIENT_FLOWTOOLS(V_FLOWTOOLS, V_INCLS) ++AC_CHECK_HEADERS([zlib.h], [AC_CHECK_LIB([z], [uncompress], [ZLIB="-lz"])]) ++AC_QOSIENT_FLOWTOOLS([V_FLOWTOOLS], [V_INCLS]) + + if test ! -z "$V_FLOWTOOLS"; then + AC_DEFINE([ARGUS_FLOWTOOLS], [], [Using Flow Tools library]) + diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml index 3c7f800f1c84..08109ceb82f0 100644 --- a/net-analyzer/argus-clients/metadata.xml +++ b/net-analyzer/argus-clients/metadata.xml @@ -1,10 +1,14 @@ - -netmon@gentoo.org -Gentoo network monitoring and analysis project - -Enable support for flow packets through -net-analyzer/flow-tools + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + + Enable support for flow packets through net-analyzer/flow-tools + + + openargus/clients + diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index 79383ea4c12b..91b7f72af405 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -3,7 +3,8 @@ AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037 AUX argus-3.0.8.3-ar.patch 240 BLAKE2B 28cfc93b87a7dbad663f10b1686b51344c1bcec23e2ad83863798b22f56dce1f76e496f864b1d8b815f12ab016e3c161ce234d01cea296437e000761a63f5cf4 SHA512 4aadb3a5c4f65d0a11e7eeecb66bae7dfbbbe9ddf933319788a2b4f109df3971c24b85a6932a9e29f5c8a39c26b854dbe015de84206df36bd91a3c076638eec7 AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c1d99b1bc2bdf2e7c94d45f323ef98835ad4a1fd303dbe84006ce0099584c081f2c3f482996e31f5ef4d51ac29860bf SHA512 c8ce35d80e784ca09b46dfcb804cf103b5263e48a0009aa3e7a2a1c6bdf4158c8276136a0086a7b8d3ca5414cf40aa67e86923bf59a7b9398368ba08fbc4d4bd +AUX argus-3.0.8.3-configure-clang16.patch 1229 BLAKE2B 9b3a3274fdfd2036ba4ada964c84749cdec6df462c883afa92b89dfcf0d478ddf2d475ea4c8665b031b80f4cb07c5dd9308013bb2a42a0f2856a9b33446c8261 SHA512 950c358e024e661a9fe61688fe1c5e25ea35051ec144b52be9a110f796d6cd705d00f7e6ab67b52c3a2c7043369e20701ff16e31e63e689e35c55cae0014c1de AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a -EBUILD argus-3.0.8.3-r1.ebuild 2027 BLAKE2B c42a9d8f32014719a0e14ca3d1bbcde1ea1502d017b2e6fc65976f8347babc8d730563873ceb697c2d2a8eff2178c84c533078d8d47e06f874ca41702ca902d5 SHA512 ed897208fddef0e11e7436851eb8bd3c95d8d5195928a9a8c6994c6acfc2622d4b3a639de0abd09a5e32bb1f51e905d532f1f0ff8b1c34cafbc56263e105aac2 -MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619 +EBUILD argus-3.0.8.3-r2.ebuild 2082 BLAKE2B 7c4cd49a7efbcfe32370f9c75fca6f345accfbb5ad2dadd5ebec885a6d16d91340878ecc0aec392a1c0f3d6ce19d7aafb4b922419b5374aca429be17ff4daf05 SHA512 4f3b62928ef324a9082d42be97fa7a2975f919bccac3c0063b2651f7528ebf993288a4cfc45f0aca1f1a18cbee62f72994e1ec37637e0e933c892f58be709894 +MISC metadata.xml 361 BLAKE2B abfcb95fa56eebd89f00f0140fe8ce8d3f84d24a29c33755d02994fbdda40891093601a36c69b38806d8a34b8293315fec522083ff39f9a4709ca374538cfae2 SHA512 7cd6707b397c7fb7d185754097f594024c7e0aa672ce32384875b4d39629b7f8f49fc3c603f6b82e2cad217d36ca6be97b50ab68071532351d8b8c8b335fac90 diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild deleted file mode 100644 index a4176cf571c4..000000000000 --- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://openargus.org/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl tcpd" - -RDEPEND=" - acct-group/argus - acct-user/argus - net-libs/libnsl:= - net-libs/libpcap - net-libs/libtirpc - sys-libs/zlib - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch - "${FILESDIR}"/${PN}-3.0.8.3-ar.patch - "${FILESDIR}"/${PN}-3.0.8.3-as-needed.patch -) -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - - default - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - - econf \ - $(use_with sasl) \ - $(use_with tcpd wrappers) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" -} - -src_install() { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.3-r2.ebuild b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild new file mode 100644 index 000000000000..e316b6bc37ef --- /dev/null +++ b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="network Audit Record Generation and Utilization System" +HOMEPAGE="https://openargus.org/" +SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" +S="${WORKDIR}"/${P/_rc/.rc.} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug sasl tcpd" + +RDEPEND=" + acct-group/argus + acct-user/argus + net-libs/libnsl:= + net-libs/libpcap + net-libs/libtirpc + sys-libs/zlib + sasl? ( dev-libs/cyrus-sasl ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/bison-1.28 + >=sys-devel/flex-2.4.6 +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.5-Makefile.patch + "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch + "${FILESDIR}"/${PN}-3.0.8.3-ar.patch + "${FILESDIR}"/${PN}-3.0.8.3-as-needed.patch + "${FILESDIR}"/${PN}-3.0.8.3-configure-clang16.patch +) + +src_prepare() { + find . -type f -execdir chmod +w {} \; #561360 + sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ + -i argus/argus.c \ + -i support/Config/argus.conf \ + -i man/man8/argus.8 \ + -i man/man5/argus.conf.5 || die + + sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ + -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ + -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ + -i support/Config/argus.conf || die + + default + eautoreconf +} + +src_configure() { + use debug && touch .debug # enable debugging + + econf \ + $(use_with sasl) \ + $(use_with tcpd wrappers) +} + +src_compile() { + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + doman man/man5/*.5 man/man8/*.8 + + dosbin bin/argus{,bug} + + dodoc ChangeLog CREDITS README + + insinto /etc/argus + doins support/Config/argus.conf + + newinitd "${FILESDIR}/argus.initd" argus + keepdir /var/lib/argus +} + +pkg_postinst() { + elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" + elog "possible that the init script will fail to work." +} diff --git a/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch b/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch new file mode 100644 index 000000000000..2e9720c04326 --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch @@ -0,0 +1,41 @@ +https://github.com/openargus/argus/pull/5 + +From dd987328bd2b99977a1a686a1a6b36d1a3155ff7 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 25 Nov 2022 19:03:24 +0100 +Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function + decls + +Implicit function declarations were removed from the C language +in 1999. Include the relevant header files to ensure that the +check still works with future compilers. C99 also requires +to declare the return types of all functions. +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include + # include + # include ++# include ++# include + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +--- a/configure ++++ b/configure +@@ -5791,8 +5791,10 @@ else + # include + # include + # include ++# include ++# include + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml index dce3f3be66c0..3d34f5bdfded 100644 --- a/net-analyzer/argus/metadata.xml +++ b/net-analyzer/argus/metadata.xml @@ -1,8 +1,11 @@ - - netmon@gentoo.org - Gentoo network monitoring and analysis project - + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + + openargus/argus + diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 17cc6818b8cd..321d7e0d2e1c 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -2,7 +2,6 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad2 AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da3ebfbe94eafcb03ffc39b6ec1440112c7c1e98c9dfb020466dddecee074cf61fbcdacecae58982456bab99d6e1d771148bb6f111ec9db0900 SHA512 8e4ab9eb474413b22a6893bbcab01edd655bf354c263cfba339c37b2c14093ab22aac05d732576266fa3e98880b29473cf5ff29494c54e954215f58a5768409e DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7 DIST monitoring-plugins-2.3.2.tar.gz 2766966 BLAKE2B 1a9c35e8df22d5666005b4b79f5a7ee878c0d4be1e98039f341b198a658747010e8c9d1c0a1818d67a402e5c302ec5eb5073628d52c29caf41dbc2ce57c18f6c SHA512 d155f09ddd99f4e0d065627d3bf8768e13ae3f58ed25912f33b070cd24d6f3f43243616ec3e2d496dec633feee6b1f14950035a928034a1413f725814e850765 -EBUILD monitoring-plugins-2.3.1-r2.ebuild 3036 BLAKE2B 7428b5713ceb286428f3b680393c9d1a223cf7e5d096433040a2efe0c8e0cc4cd50041f6fe70bcd8c9c2df02497a6a1b70da0a7b1310dc53efd11ec67389ac42 SHA512 cf86c9664d7dc43923441176aa3cf1e960137c94c9b83374c0fa32d04aa9f1460face47f3f4621a544e5a0cfe285fc412e86fdd6d39c004b4bb3afd798687953 -EBUILD monitoring-plugins-2.3.1-r3.ebuild 3046 BLAKE2B b3ae12e1527c6e02491dcdaeff811b727cc9ac083dca737e8acf03cacad56450402627e2407e1f616a410fd32f88c5545ba3d81e4819ede55e42e5361ad4a7fd SHA512 27938ca4a072e93c33de7544f840baeb45042c5d7ecd650c7eea5452ab4da4ec13f710bb55acb194ef93340a62a6a2307cff69c679bd473c08b3f3586e35c4e1 -EBUILD monitoring-plugins-2.3.2.ebuild 2977 BLAKE2B d075be742695b4e37361c8268f33742162a90c0e227a6c15681e8eb49a087362555bca64fd76bf5d2ca1956995b85b3ffac6e8a033dc3b0e8bc8f8050b40f370 SHA512 1110e2a98caa018f6ea0ca75e767e42c6ffa4582d672b7a6bd566450c92d4139a9b546745b960bff5a1ff27b010a715e6e67dbd5590e84d2d8e5768a71970966 +EBUILD monitoring-plugins-2.3.1-r4.ebuild 3128 BLAKE2B e98bc4bfd457e4d634560bf72b2edee08b47ed1b909bc691ade912ec5671da16f098d30ac62b1acb7512629f4da154836a9d01a7fca742f87b71f6cb8e0676e0 SHA512 f94963c668a11d67be9ab488ad39382d614bc0e246704fea51ca18bc3ec1dcf77c87fe36a3d3ab07b2d841fa7cbdb94db90d3bbca030458130b2087304e6c20f +EBUILD monitoring-plugins-2.3.2-r1.ebuild 3059 BLAKE2B 2e8012fd6e9d24ec0ab8ad865b0c2c2c6cc4a836da5659f31187a710a03c2dbf01a82b430306e3aeb093a21250728c5220b756db391d2f9f2d6b06a24c1d855e SHA512 53821ecb5bc782684a6b6b8d85cd40393dfb2871fb60bacb199606e8bfb01108f28652c49bb147c43d09ebbd4f768b26d35e32cd84ebf1f17ac08afbebceffb6 MISC metadata.xml 1435 BLAKE2B 19cf3223867cee4899e5bdaf33948497c5cd66e94198b6a0c081ea440bf7ecfc7dcf4855b44a7ead5fc983756490f3a79059d51202be9d9f2eea24c6857eb165 SHA512 c781d735ced89fe81d49f400ada6916702ad2825c35c6bb589199902917df415a50335ce058eea45e6eb3fe66813ed2f4009cc6831e15d2b7369fcc12e8c0b26 diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild deleted file mode 100644 index 98c4b1592214..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 sparc x86" -IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - curl? ( - dev-libs/uriparser - net-misc/curl - ) - ldap? ( net-nds/openldap:= ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - dev-libs/openssl:0= - ) - gnutls? ( net-libs/gnutls ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - acct-group/nagios - acct-user/nagios - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with curl libcurl) \ - $(use_with curl uriparser) \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild deleted file mode 100644 index 70689ddedd5c..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit flag-o-matic - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 sparc x86" -IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - curl? ( - dev-libs/uriparser - net-misc/curl - ) - ldap? ( net-nds/openldap:= ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - dev-libs/openssl:0= - ) - gnutls? ( net-libs/gnutls ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - acct-group/nagios - acct-user/nagios - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-fix-check-disk-on-btrfs.patch" #830249 -) - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with curl libcurl) \ - $(use_with curl uriparser) \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild new file mode 100644 index 000000000000..bee2b77ec739 --- /dev/null +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit flag-o-matic + +DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" +HOMEPAGE="https://www.monitoring-plugins.org/" +SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 sparc x86" +IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +# +# REAL_DEPEND contains the dependencies that are actually needed to +# build. DEPEND contains those plus the automagic dependencies. +# +REAL_DEPEND="dev-lang/perl + curl? ( + dev-libs/uriparser + net-misc/curl + ) + ldap? ( net-nds/openldap:= ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) + postgres? ( dev-db/postgresql:= ) + ssl? ( + !gnutls? ( + dev-libs/openssl:0= + ) + gnutls? ( net-libs/gnutls ) + ) + radius? ( net-dialup/freeradius-client )" + +DEPEND="${REAL_DEPEND} + dns? ( net-dns/bind-tools ) + game? ( games-util/qstat ) + fping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Basically everything collides with nagios-plugins. +RDEPEND="${DEPEND} + acct-group/nagios + acct-user/nagios + !net-analyzer/nagios-plugins" + +# At least one test is interactive. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-fix-check-disk-on-btrfs.patch" #830249 +) + +src_configure() { + append-flags -fno-strict-aliasing + + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with !gnutls openssl /usr) + $(use_with gnutls gnutls /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered (bug #468296). But also the path + # likes to move around on us (bug #883729). + myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) + fi + + econf \ + $(use_with curl libcurl) \ + $(use_with curl uriparser) \ + $(use_with mysql) \ + $(use_with ipv6) \ + $(use_with ldap) \ + $(use_with postgres pgsql /usr) \ + $(use_with radius) \ + "${myconf[@]}" \ + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" +} + +DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ + NEWS README REQUIREMENTS SUPPORT THANKS ) + +pkg_postinst() { + elog "This ebuild has a number of USE flags that determine what you" + elog "are able to monitor. Depending on what you want to monitor, some" + elog "or all of these USE flags need to be set." + elog + elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" +} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild new file mode 100644 index 000000000000..27bd712c16c3 --- /dev/null +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit flag-o-matic + +DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" +HOMEPAGE="https://www.monitoring-plugins.org/" +SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86" +IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +# +# REAL_DEPEND contains the dependencies that are actually needed to +# build. DEPEND contains those plus the automagic dependencies. +# +REAL_DEPEND="dev-lang/perl + curl? ( + dev-libs/uriparser + net-misc/curl + ) + ldap? ( net-nds/openldap:= ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) + postgres? ( dev-db/postgresql:= ) + ssl? ( + !gnutls? ( + dev-libs/openssl:0= + ) + gnutls? ( net-libs/gnutls ) + ) + radius? ( net-dialup/freeradius-client )" + +DEPEND="${REAL_DEPEND} + dns? ( net-dns/bind-tools ) + game? ( games-util/qstat ) + fping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Basically everything collides with nagios-plugins. +RDEPEND="${DEPEND} + acct-group/nagios + acct-user/nagios + !net-analyzer/nagios-plugins" + +# At least one test is interactive. +RESTRICT="test" + +src_configure() { + append-flags -fno-strict-aliasing + + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with !gnutls openssl /usr) + $(use_with gnutls gnutls /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered (bug #468296). But also the path + # likes to move around on us (bug #883729). + myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) + fi + + econf \ + $(use_with curl libcurl) \ + $(use_with curl uriparser) \ + $(use_with mysql) \ + $(use_with ipv6) \ + $(use_with ldap) \ + $(use_with postgres pgsql /usr) \ + $(use_with radius) \ + "${myconf[@]}" \ + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" +} + +DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ + NEWS README REQUIREMENTS SUPPORT THANKS ) + +pkg_postinst() { + elog "This ebuild has a number of USE flags that determine what you" + elog "are able to monitor. Depending on what you want to monitor, some" + elog "or all of these USE flags need to be set." + elog + elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" +} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild deleted file mode 100644 index 68ba0969bbbc..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit flag-o-matic - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86" -IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - curl? ( - dev-libs/uriparser - net-misc/curl - ) - ldap? ( net-nds/openldap:= ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - dev-libs/openssl:0= - ) - gnutls? ( net-libs/gnutls ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - acct-group/nagios - acct-user/nagios - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with curl libcurl) \ - $(use_with curl uriparser) \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 1bcea1a39557..f53dd9cd88b2 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,6 +1,6 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff DIST nagios-plugins-2.4.2.tar.gz 2740092 BLAKE2B 73101f0d439a10bbc0e5d576fe1cf60f115eead00e4611e2f820ebde86390daf1904a45603389a6ad0a9fdb0f14fb49b429ad571159f605df5490f9798fc18d1 SHA512 43448483301c8f5fb9be9b496514a9e15199c320b2a320bb93c4fc6f6fcd35f2a469f980916b37b2b7e565edcb14eea1692f290b0a7bca9364e298eb42af63ce -EBUILD nagios-plugins-2.4.0.ebuild 3023 BLAKE2B 1cec2d601cdd63e886a41aaf0572af0383eb32c3c64658b97dad02a7320b2a094fe0c8b9767cec0508af9d654946317c3b302a6c64e7dc1d1cbdab58a6f19a14 SHA512 0915eafb1fc7c44f14a56225066fd33e307e2bbcfbfdb82a71adaedc3a7cb5fcab8c5578343cd0363d7c74277319c1bcd8f46a88fef591d04fd3243293f7a6c7 -EBUILD nagios-plugins-2.4.2.ebuild 2962 BLAKE2B c7af927412f9326e76c04e9f4f151697f8c733aa595c4279b921522a3272d46a0f1b001ca4ffb66ef885e7a3c684c6e9829fb8deec7c94738aa5fbd87bab0bf9 SHA512 2e6dbf1a8a5ac1c610c105697e14cb9ca138328982e43739664d841cb0d581dd3eab4eb6d7730085ceff87a2b6ccd9ac194d007bd3044877b15d13a3baf033f1 +EBUILD nagios-plugins-2.4.0-r2.ebuild 3105 BLAKE2B 01ec6370a9a012276f884b67ece6c7f6a51e44921dd3032ba3c81e47c421ff6506c163bde204f8726d89326a7f384422b38b5790f9cf6eb9347b73d281288904 SHA512 b6ed87ca497ac292c343fb5573662d6bc02c355ec04a48d0c068017bb94b45426e07f6babf86ac47a4d31a16d7bce4716348208d452b750295d17a0c4e38f8b7 +EBUILD nagios-plugins-2.4.2-r2.ebuild 3044 BLAKE2B 7320972d54a00457286ee7ce24050450cd214d18d2ad9cc478689e0154b6d3806da399c05fc07ac744aa32022a8a8239f41d13c3836b70ded62bf43ca862496c SHA512 5bdf69f819f082e58a6674eb0f43814e984c8b0bbef9d05883226209c15e16e2172fe714a587780560faa2a5465824e6ed80b469094594c3f5a58b6dfc45b308 MISC metadata.xml 1431 BLAKE2B 7a5b71bb1d5acc47492a8ac0414c5de789e2fff607a1602c8e464dd4285adb1acd71f152dc9dae18bade31623d78ca2ebe796b871f62542d2d29a75a3b5e4ce6 SHA512 5aa293f0fd8f810b3b750772e260009cbf10bb68aae1f8cbb9e02f7565204f8ae14da3f6a18db58e9fdff5fd97ba8566d07a421ff8bc35f07747338ced13b92c diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild new file mode 100644 index 000000000000..ea52cc31e226 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="https://nagios-plugins.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86" +IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +AUTOMAGIC_DEPEND=" + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Perl really needs to run during the build... +BDEPEND="${AUTOMAGIC_DEPEND} + dev-lang/perl" + +DEPEND=" + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + dev-libs/openssl:0= + ) + radius? ( net-dialup/freeradius-client )" + +# Basically everything in net-analyzer/monitoring-plugins collides with +# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. +RDEPEND="${BDEPEND} + ${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +DOCS=( + ACKNOWLEDGEMENTS + AUTHORS + CODING + ChangeLog + FAQ + NEWS + README + REQUIREMENTS + SUPPORT + THANKS +) + +PATCHES=( + "${FILESDIR}/define-own-mysql-port-constant.patch" +) + +src_prepare() { + default + + # Fix the path to our perl interpreter + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ + "${S}"/plugins-scripts/*.pl \ + || die 'failed to fix perl interpreter path' +} + +src_configure() { + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with ssl openssl /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered (bug #468296). 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-plugins/nagios-plugins-2.4.0.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild deleted file mode 100644 index 32f8cfa80212..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="https://nagios-plugins.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86" -IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -AUTOMAGIC_DEPEND=" - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Perl really needs to run during the build... -BDEPEND="${AUTOMAGIC_DEPEND} - dev-lang/perl" - -DEPEND=" - ldap? ( net-nds/openldap:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - dev-libs/openssl:0= - ) - radius? ( net-dialup/freeradius-client )" - -# Basically everything in net-analyzer/monitoring-plugins collides with -# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. -RDEPEND="${BDEPEND} - ${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -PATCHES=( - "${FILESDIR}/define-own-mysql-port-constant.patch" -) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild new file mode 100644 index 000000000000..8fe32f3ad69a --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="https://nagios-plugins.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +AUTOMAGIC_DEPEND=" + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Perl really needs to run during the build... +BDEPEND="${AUTOMAGIC_DEPEND} + dev-lang/perl" + +DEPEND=" + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + dev-libs/openssl:0= + ) + radius? ( net-dialup/freeradius-client )" + +# Basically everything in net-analyzer/monitoring-plugins collides with +# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. +RDEPEND="${BDEPEND} + ${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +DOCS=( + ACKNOWLEDGEMENTS + AUTHORS + CODING + ChangeLog + FAQ + NEWS + README + REQUIREMENTS + SUPPORT + THANKS +) + +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-plugins/nagios-plugins-2.4.2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild deleted file mode 100644 index 7b20af18afa6..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="https://nagios-plugins.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -AUTOMAGIC_DEPEND=" - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Perl really needs to run during the build... -BDEPEND="${AUTOMAGIC_DEPEND} - dev-lang/perl" - -DEPEND=" - ldap? ( net-nds/openldap:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - dev-libs/openssl:0= - ) - radius? ( net-dialup/freeradius-client )" - -# Basically everything in net-analyzer/monitoring-plugins collides with -# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. -RDEPEND="${BDEPEND} - ${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 3d28fc88ee4f..fa1c6a2ac674 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,8 +1,10 @@ DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3516f7ff2a6fda77829433398986bc564b377362097ea7c2595ac01911a817be124c9f0ba560dd00ae5001a080da7 SHA512 43cbf099841fe2547b7de56610f811e55fdf2e9af3dc18fde818e09de1125a7f8d57f6a16f2dee8ea4b9e6f2683959549810a1ea7f8f7b5007eb7069bfddb477 DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961cafe060d285fcd63f968c5f33cd2c4393288c44262eb12665c6471d757d65a9a2406c7d80997736ada6189ba1c8450 SHA512 1748c5f6ea392b6cfc6b761632bc632422fb6910f53fb26a796003cdc0048f28ab550daa0658a6d5de5fec65b0a5aae8f44f68ec65c19f06b11eda6fd337c8d4 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d +DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf EBUILD netdata-1.35.1.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870 EBUILD netdata-1.36.0.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870 EBUILD netdata-1.36.1-r1.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711 +EBUILD netdata-1.37.0.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711 EBUILD netdata-9999.ebuild 3923 BLAKE2B d0bb987251d17d36c82608b7d321a54f29468d79340d6f406c60ab1cf8c91c01a5871d51d0964b5d63fe9a039932136b998bca7839ea07e3dd1409fb40300660 SHA512 d4bb01715f36f64d2d5f7606afbe38471cd99da1271da982a3e0bfcc75d58b96d5e7d55754ffaeb7660fbb966908e310203c8e8c3a36b9d695f34b0581d87609 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484 diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild new file mode 100644 index 000000000000..555475886149 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.37.0.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_8,3_9,3_10} ) + +inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs + +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 ~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="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python 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 + virtual/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + app-arch/lz4:= + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libuv:= + cloud? ( dev-libs/protobuf:= ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( dev-libs/json-c:= ) + kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + 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 + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + if use ppc64; then + # bundled dlib does not support vsx on big-endian + # https://github.com/davisking/dlib/issues/397 + [[ $(tc-endian) == big ]] && append-flags -mno-vsx + fi + + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + --without-bundled-protobuf \ + $(use_enable cloud) \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + $(use_enable kinesis exporting-kinesis) \ + $(use_enable lto lto) \ + $(use_enable mongodb exporting-mongodb) \ + $(use_enable prometheus exporting-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_compile() { + emake clean + default +} + +src_install() { + default + + rm -rf "${D}/var/cache" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + fowners -Rc netdata:netdata /var/lib/netdata + + fowners -Rc root:netdata /usr/share/${PN} + + newinitd system/netdata-openrc ${PN} + systemd_dounit system/netdata.service + 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 +} diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest index bd26f7bd3c60..10af5fd08a61 100644 --- a/net-analyzer/wtfis/Manifest +++ b/net-analyzer/wtfis/Manifest @@ -1,4 +1,6 @@ DIST wtfis-0.4.0.gh.tar.gz 459363 BLAKE2B 10338f17700815aa8f25bd1e9587855795710925481ea3d7bd85782fea657055053d965977f601bc25d624352c97c639008d33d30aa3ac248ea7504c7e0ceaa7 SHA512 bb19923668e8172fd07b86159839c95a1b32d9975edcf1e9ab99bb574eae24f70c3a6bf83cc8ade66c1e5f57632625e7f604966ee06445839df87a9af4962573 +DIST wtfis-0.5.0.gh.tar.gz 461913 BLAKE2B 57be019cda4d67943b0c1b2f99013b34351d2ded036f76939f94221218554b5c3fe8711da85f40fcd0fdfbb57df5713b4a72cd09a6b665b5893ffdb8efca493f SHA512 5717ea43d63843f2b6d1e70afac12a70790284a1ed9bdae31c0ee062f77b718e19e913cfefb30cb3bdebf2f925da153354aa906349de97707ac739f736fc94ad EBUILD wtfis-0.4.0.ebuild 971 BLAKE2B d95c1f70bd78be840ea7529c4149858ab6c1366777beb04f1c6d5a7d6a3c7b5d2875c26d74b86c2c2d597ca2dbce8ec26a655eb9f173ae79a6ec86140d2961af SHA512 b466bacaeac22182c61beed690546d664b9d8f7d10f7b1222423a7d45bd1db274aaa7285c1cfde7d7e463d5de69929dc220bdcdfedcbb07f515879eb4304847f +EBUILD wtfis-0.5.0.ebuild 971 BLAKE2B d95c1f70bd78be840ea7529c4149858ab6c1366777beb04f1c6d5a7d6a3c7b5d2875c26d74b86c2c2d597ca2dbce8ec26a655eb9f173ae79a6ec86140d2961af SHA512 b466bacaeac22182c61beed690546d664b9d8f7d10f7b1222423a7d45bd1db274aaa7285c1cfde7d7e463d5de69929dc220bdcdfedcbb07f515879eb4304847f EBUILD wtfis-9999.ebuild 964 BLAKE2B 66c5cbfee274186ae7a8f898bcbb7b1b1e3df9f956ef42cc82fe3c8e74dc0e7282b2a4a813dfcb4b42f2a0e6fd78a73fe77143f41f0dbaf847d642335d4c4866 SHA512 baa1c98f33251815252d6f972040bebcbec92f32867bfddf628a4b176c396068b5ad1e3161bb599100f12936315f5590b99d29ea3c395f9227e6edcc58e14432 MISC metadata.xml 855 BLAKE2B 552b9998e0eada39d9a0f0e092c566e9a75c5ac2e2360df66d9b7334e663a9fb4a82be51f31623f31644e2863d78570405dc94e36769be7cbbcc3539cf49d920 SHA512 56593e8b58a019e4cdbf23946331c34f66fc72e318271916b33f3f63ccfb2d7a546dcbf05fcd0bd0bce9e5e0ce8f7b0cfd621b4b938c0eed135c34d025fdfc32 diff --git a/net-analyzer/wtfis/wtfis-0.5.0.ebuild b/net-analyzer/wtfis/wtfis-0.5.0.ebuild new file mode 100644 index 000000000000..06c4fc422fe5 --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.5.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" +HOMEPAGE="https://github.com/pirxthepilot/wtfis" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git" +else + SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.28.1[${PYTHON_USEDEP}] + >=dev-python/rich-12.6.0[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.28.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest -- cgit v1.2.3