[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2024-08-01 Thread Michael Orlitzky
commit: d3fee0622ab8bc09889666c6ba278f66bef06bf2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Aug  1 12:22:31 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Aug  1 12:22:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fee062

net-analyzer/monitoring-plugins: silence two more implicit decl warnings

Closes: https://bugs.gentoo.org/936891
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
index b7b41a925869..b7666ec27696 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
@@ -58,10 +58,12 @@ RDEPEND="${DEPEND}
 RESTRICT="test"
 
 # These all come from gnulib and the ./configure checks are working as
-# intended when the functions aren't present. Bug 921190.
+# intended when the functions aren't present. Bugs 921190 and 936891.
 QA_CONFIG_IMPL_DECL_SKIP=(
MIN
+   fpurge
static_assert
+   statvfs64
alignof
 )
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2024-06-30 Thread Michael Orlitzky
commit: 0756059faf42834c672a83a21761b02cc00aa193
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jul  1 01:26:58 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jul  1 01:26:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0756059f

net-analyzer/monitoring-plugins: squash some implicit decl warnings

Closes: https://bugs.gentoo.org/921190
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../monitoring-plugins/monitoring-plugins-2.3.5.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
index c09500eb8d38..b7b41a925869 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -57,6 +57,14 @@ RDEPEND="${DEPEND}
 # At least one test is interactive.
 RESTRICT="test"
 
+# These all come from gnulib and the ./configure checks are working as
+# intended when the functions aren't present. Bug 921190.
+QA_CONFIG_IMPL_DECL_SKIP=(
+   MIN
+   static_assert
+   alignof
+)
+
 src_configure() {
append-flags -fno-strict-aliasing
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

2024-06-26 Thread Michael Orlitzky
commit: bccde6103866dd95567e30b219ef006b25249d5b
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jun 26 11:34:20 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jun 26 11:34:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccde610

net-analyzer/monitoring-plugins: remove obsolete patches

Signed-off-by: Michael Orlitzky  gentoo.org>

 ...onitoring-plugins-fix-check-http-segfault.patch | 23 --
 .../files/monitoring-plugins-gnutls.patch  | 21 
 2 files changed, 44 deletions(-)

diff --git 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
deleted file mode 100644
index 34e539f51e2d..
--- 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/893252
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1836
-https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76
-
-diff --git a/plugins/check_http.c b/plugins/check_http.c
-index 5fa310f5d..8dda046ff 100644
 a/plugins/check_http.c
-+++ b/plugins/check_http.c
-@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) {
- memcpy(result + (overall_size - size_of_chunk), start_of_chunk, 
size_of_chunk);
-   }
- 
--  result[overall_size] = '\0';
-+  if (overall_size == 0 && result == NULL) {
-+// We might just have received the end chunk without previous content, so 
result is never allocated
-+result = calloc(1, sizeof(char));
-+// No error handling here, we can only return NULL anyway
-+  } else {
-+result[overall_size] = '\0';
-+  }
-   return result;
- }
- 

diff --git 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
deleted file mode 100644
index 00415f0b7111..
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/880211
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1834
-https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4
-
-diff --git a/plugins/sslutils.c b/plugins/sslutils.c
-index 286273f6..c26c4fb3 100644
 a/plugins/sslutils.c
-+++ b/plugins/sslutils.c
-@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int 
sd, char *host_name, int
-   return STATE_CRITICAL;
-   }
-   if (cert && privkey) {
-+#ifdef USE_GNUTLS
-+  SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM);
-+#endif
-+#ifdef USE_OPENSSL
-   SSL_CTX_use_certificate_chain_file(c, cert);
-+#endif
-   SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
- #ifdef USE_OPENSSL
-   if (!SSL_CTX_check_private_key(c)) {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2024-06-26 Thread Michael Orlitzky
commit: 3a5a3e22aeffa1b3bd7d40080b80a80725da2589
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jun 26 11:31:24 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jun 26 11:31:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5a3e22

net-analyzer/monitoring-plugins: add local "ipv6" desc for pkgcheck

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/metadata.xml 
b/net-analyzer/monitoring-plugins/metadata.xml
index 37237fb7544c..b8ca2be8aea7 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -26,6 +26,10 @@
   Install net-analyzer/fping required for fancy ping
   monitoring. Disabling the flag does not remove any plugins.
 
+
+
+  Enable ipv6 checks.
+
 
   Install net-misc/openssh required for monitoring SSH
   servers. Disabling the flag does not remove any plugins.



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2024-06-26 Thread Michael Orlitzky
commit: f80b374043945c811c758e13516f1c9f98f1fe3f
Author: NHOrus  yahoo  com>
AuthorDate: Wed Jun 26 06:25:37 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jun 26 11:21:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80b3740

net-analyzer/monitoring-plugins: drop 2.3.3-r2

We have 2.3.5 that fixed those errors and is stable.

Closes: https://bugs.gentoo.org/871519
Closes: https://bugs.gentoo.org/892471
Closes: https://github.com/gentoo/gentoo/pull/37306
Signed-off-by: NHOrus  yahoo.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 -
 .../monitoring-plugins-2.3.3-r2.ebuild | 110 -
 2 files changed, 111 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 545a0d98a9f7..db1a7cbc1868 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,2 +1 @@
-DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 
47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246
 SHA512 
502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
 DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 
7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41
 SHA512 
bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
deleted file mode 100644
index e364f28aa4cc..
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 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? ( virtual/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}-gnutls.patch" #880211
-   "${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
-)
-
-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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-11-23 Thread Sam James
commit: da766e35e6e9448c047d8dea25e0516bdae7beff
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 23 19:52:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 23 19:52:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da766e35

net-analyzer/monitoring-plugins: Stabilize 2.3.5 amd64, #917803

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
index 5d2b6bc60c23..481a2dc0c1b5 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-11-23 Thread Michał Górny
commit: cc94f745d3855c90293d3c72b3e7afa2de527088
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Nov 23 16:33:46 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Nov 23 16:33:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc94f745

net-analyzer/monitoring-plugins: Stabilize 2.3.5 x86, #917803

Signed-off-by: Michał Górny  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
index 0dae17b07692..5d2b6bc60c23 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

2023-10-28 Thread Michael Orlitzky
commit: f2698cdae92237d5b631877b5dba4f46cd5cdfcd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Oct 27 05:22:58 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Oct 28 16:20:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2698cda

net-analyzer/monitoring-plugins: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/33534
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../monitoring-plugins-fix-check-disk-on-btrfs.patch | 20 
 1 file changed, 20 deletions(-)

diff --git 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
deleted file mode 100644
index cbd458372133..
--- 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/830249
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1357
-https://github.com/monitoring-plugins/monitoring-plugins/commit/e17c1e9ed95b8b9681dccd5a909ac5a02a04416c
-
-diff --git a/plugins/check_disk.c b/plugins/check_disk.c
-index 844e625f..a2735195 100644
 a/plugins/check_disk.c
-+++ b/plugins/check_disk.c
-@@ -1068,10 +1068,7 @@ get_stats (struct parameter_list *p, struct fs_usage 
*fsp) {
- 
- void
- get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
--  /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
--  * space on BSD (the actual value should be negative but fsp->fsu_bavail
--  * is unsigned) */
--  p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
-+  p->available = fsp->fsu_bavail;
-   p->available_to_root = fsp->fsu_bfree;
-   p->used = fsp->fsu_blocks - fsp->fsu_bfree;
-   if (freespace_ignore_reserved) {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-10-23 Thread Michael Orlitzky
commit: f30190db61cfe9b4f0d418348c1da6d7c72c4eef
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Oct 18 10:55:15 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Oct 23 21:32:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30190db

net-analyzer/monitoring-plugins: drop old

Closes: https://github.com/gentoo/gentoo/pull/33392
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   2 -
 .../monitoring-plugins-2.3.1-r5.ebuild | 109 -
 .../monitoring-plugins-2.3.2-r2.ebuild | 105 
 3 files changed, 216 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 45a1c2ef1c62..545a0d98a9f7 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,4 +1,2 @@
-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
 DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 
47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246
 SHA512 
502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
 DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 
7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41
 SHA512 
bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
deleted file mode 100644
index b0bacbb75463..
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 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? ( virtual/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 )
-  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-10-23 Thread Michael Orlitzky
commit: a6d7be70801bd0cecbfd2ac685a158e4ae082e3a
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Oct 18 10:54:53 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Oct 23 21:23:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d7be70

net-analyzer/monitoring-plugins: add 2.3.5

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../monitoring-plugins-2.3.5.ebuild| 105 +
 2 files changed, 106 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index fdecddd96a18..45a1c2ef1c62 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,3 +1,4 @@
 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
 DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 
47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246
 SHA512 
502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
+DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 
7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41
 SHA512 
bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
new file mode 100644
index ..0dae17b07692
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 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? ( virtual/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 arou

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-05-11 Thread Sam James
commit: c521f98e07c6296f619399a64905fea18b1c1fe8
Author: David Seifert  gentoo  org>
AuthorDate: Mon May  8 20:56:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 11 20:03:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c521f98e

net-analyzer/monitoring-plugins: switch to virtual/openssh

Signed-off-by: David Seifert  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 ...ing-plugins-2.3.1-r4.ebuild => monitoring-plugins-2.3.1-r5.ebuild} | 4 ++--
 ...ing-plugins-2.3.2-r1.ebuild => monitoring-plugins-2.3.2-r2.ebuild} | 2 +-
 ...ing-plugins-2.3.3-r1.ebuild => monitoring-plugins-2.3.3-r2.ebuild} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
similarity index 97%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
index bee2b77ec739..b0bacbb75463 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -44,7 +44,7 @@ DEPEND="${REAL_DEPEND}
game? ( games-util/qstat )
fping? ( net-analyzer/fping )
samba? ( net-fs/samba )
-   ssh? ( net-misc/openssh )
+   ssh? ( virtual/openssh )
snmp? ( dev-perl/Net-SNMP
net-analyzer/net-snmp[-minimal] )"
 

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r2.ebuild
similarity index 99%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r2.ebuild
index ee3f8666e960..3cea165dde1d 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r2.ebuild
@@ -44,7 +44,7 @@ DEPEND="${REAL_DEPEND}
game? ( games-util/qstat )
fping? ( net-analyzer/fping )
samba? ( net-fs/samba )
-   ssh? ( net-misc/openssh )
+   ssh? ( virtual/openssh )
snmp? ( dev-perl/Net-SNMP
net-analyzer/net-snmp[-minimal] )"
 

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
similarity index 99%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
index ac7b44413cab..e364f28aa4cc 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
@@ -44,7 +44,7 @@ DEPEND="${REAL_DEPEND}
game? ( games-util/qstat )
fping? ( net-analyzer/fping )
samba? ( net-fs/samba )
-   ssh? ( net-misc/openssh )
+   ssh? ( virtual/openssh )
snmp? ( dev-perl/Net-SNMP
net-analyzer/net-snmp[-minimal] )"
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-04-17 Thread Sam James
commit: 99de77cb0d05f68bc5efafd14f3c52391a4fe638
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 17 11:56:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 17 11:56:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99de77cb

net-analyzer/monitoring-plugins: Stabilize 2.3.3-r1 x86, #904446

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index e52d4bdeeae3..ac7b44413cab 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-04-17 Thread Sam James
commit: 8ab22e208d69831b1ca6dfabc63c233f408a367f
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 17 11:56:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 17 11:56:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab22e20

net-analyzer/monitoring-plugins: Stabilize 2.3.3-r1 sparc, #904446

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index 5dbbb7e15824..e52d4bdeeae3 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-04-17 Thread Sam James
commit: c06dba611560a284c72c53d6ed7299c55c6e0d9e
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 17 11:56:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 17 11:56:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06dba61

net-analyzer/monitoring-plugins: Stabilize 2.3.3-r1 amd64, #904446

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index 555d75dae179..5dbbb7e15824 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-02-14 Thread Sam James
commit: d5d4c2d9840cc52612c8fb895810cfe4586911e4
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 08:15:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 08:17:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d4c2d9

Revert "net-analyzer/monitoring-plugins: add temporary musl workaround"

This reverts commit 39db959d41ca077c06ff375aa2774d20e515ec24.

This seems to mess with the installation for gettext bits.

Bug: https://bugs.gentoo.org/892645
Closes: https://bugs.gentoo.org/894278
Signed-off-by: Sam James  gentoo.org>

 .../monitoring-plugins-2.3.3-r1.ebuild   | 16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index c5b2c08d156d..555d75dae179 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-inherit autotools flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
 HOMEPAGE="https://www.monitoring-plugins.org/";
@@ -53,7 +53,6 @@ RDEPEND="${DEPEND}
acct-group/nagios
acct-user/nagios
!net-analyzer/nagios-plugins"
-BDEPEND="sys-devel/gettext"
 
 # At least one test is interactive.
 RESTRICT="test"
@@ -63,19 +62,6 @@ PATCHES=(
"${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
 )
 
-src_prepare() {
-   default
-
-   # Refresh the gettext macro to fix musl build, bug #892645
-   # This should be unnecessary in the next release (>2.3.3) as upstream
-   # refreshed its copy of gnulib, so on next release:
-   # - We may be able to drop the gettext BDEPEND (check!)
-   # - Drop this cp call
-   # - Drop eautoreconf
-   cp "${BROOT}"/usr/share/aclocal/gettext.m4 gl/m4/ || die
-   eautoreconf
-}
-
 src_configure() {
append-flags -fno-strict-aliasing
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-02-13 Thread Sam James
commit: 39db959d41ca077c06ff375aa2774d20e515ec24
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 03:20:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 03:20:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39db959d

net-analyzer/monitoring-plugins: add temporary musl workaround

This won't be needed in the next release.

Closes: https://bugs.gentoo.org/892645
Signed-off-by: Sam James  gentoo.org>

 .../monitoring-plugins-2.3.3-r1.ebuild   | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index 555d75dae179..c5b2c08d156d 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
 HOMEPAGE="https://www.monitoring-plugins.org/";
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}
acct-group/nagios
acct-user/nagios
!net-analyzer/nagios-plugins"
+BDEPEND="sys-devel/gettext"
 
 # At least one test is interactive.
 RESTRICT="test"
@@ -62,6 +63,19 @@ PATCHES=(
"${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
 )
 
+src_prepare() {
+   default
+
+   # Refresh the gettext macro to fix musl build, bug #892645
+   # This should be unnecessary in the next release (>2.3.3) as upstream
+   # refreshed its copy of gnulib, so on next release:
+   # - We may be able to drop the gettext BDEPEND (check!)
+   # - Drop this cp call
+   # - Drop eautoreconf
+   cp "${BROOT}"/usr/share/aclocal/gettext.m4 gl/m4/ || die
+   eautoreconf
+}
+
 src_configure() {
append-flags -fno-strict-aliasing
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/, net-analyzer/monitoring-plugins/files/

2023-02-08 Thread Sam James
commit: 56788861591b9cd77eb629026613e038ea18d8c5
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Feb  8 11:32:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  8 17:15:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56788861

net-analyzer/monitoring-plugins: fix check_http segfault

Closes: https://bugs.gentoo.org/893252
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29481
Signed-off-by: Sam James  gentoo.org>

 ...onitoring-plugins-fix-check-http-segfault.patch | 23 ++
 ...3.ebuild => monitoring-plugins-2.3.3-r1.ebuild} |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
new file mode 100644
index ..34e539f51e2d
--- /dev/null
+++ 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/893252
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1836
+https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 5fa310f5d..8dda046ff 100644
+--- a/plugins/check_http.c
 b/plugins/check_http.c
+@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) {
+ memcpy(result + (overall_size - size_of_chunk), start_of_chunk, 
size_of_chunk);
+   }
+ 
+-  result[overall_size] = '\0';
++  if (overall_size == 0 && result == NULL) {
++// We might just have received the end chunk without previous content, so 
result is never allocated
++result = calloc(1, sizeof(char));
++// No error handling here, we can only return NULL anyway
++  } else {
++result[overall_size] = '\0';
++  }
+   return result;
+ }
+ 

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
similarity index 96%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index bf2ccb76116a..555d75dae179 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -58,7 +58,8 @@ RDEPEND="${DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-   "${FILESDIR}/monitoring-plugins-gnutls.patch"
+   "${FILESDIR}/${PN}-gnutls.patch" #880211
+   "${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/, net-analyzer/monitoring-plugins/files/

2023-02-03 Thread Sam James
commit: 79fd5b62c585d3d7b604f0a2592b7a1567b6ccd1
Author: Tomáš Mózes  gmail  com>
AuthorDate: Fri Feb  3 19:09:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 19:31:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fd5b62

net-analyzer/monitoring-plugins: add 2.3.3

Bug: https://bugs.gentoo.org/880211
Closes: https://bugs.gentoo.org/893092
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29408
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../files/monitoring-plugins-gnutls.patch  |  21 
 .../monitoring-plugins-2.3.3.ebuild| 109 +
 3 files changed, 131 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index e19b4b8e6a60..fdecddd96a18 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,2 +1,3 @@
 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
+DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 
47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246
 SHA512 
502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f

diff --git 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
new file mode 100644
index ..00415f0b7111
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/880211
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1834
+https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4
+
+diff --git a/plugins/sslutils.c b/plugins/sslutils.c
+index 286273f6..c26c4fb3 100644
+--- a/plugins/sslutils.c
 b/plugins/sslutils.c
+@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int 
sd, char *host_name, int
+   return STATE_CRITICAL;
+   }
+   if (cert && privkey) {
++#ifdef USE_GNUTLS
++  SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM);
++#endif
++#ifdef USE_OPENSSL
+   SSL_CTX_use_certificate_chain_file(c, cert);
++#endif
+   SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
+ #ifdef USE_OPENSSL
+   if (!SSL_CTX_check_private_key(c)) {

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild
new file mode 100644
index ..bf2ccb76116a
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 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 )
+   gam

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-01-31 Thread Sam James
commit: d9b66bb13cd459c77dd72559bfbae23a962d631a
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 31 12:50:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 31 12:55:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b66bb1

net-analyzer/monitoring-plugins: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/metadata.xml 
b/net-analyzer/monitoring-plugins/metadata.xml
index 68181ed33f2a..37237fb7544c 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -36,4 +36,7 @@
   values. Disabling the flag does not remove any plugins.
 
   
+  
+monitoring-plugins/monitoring-plugins
+  
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-01-28 Thread Sam James
commit: 8811f42bfbdd8e0f3c19a799241696ec7e6c5a5e
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 28 09:06:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 28 09:06:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8811f42b

net-analyzer/monitoring-plugins: Stabilize 2.3.2-r1 sparc, #883793

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f7df02c50c19..ee3f8666e960 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-01-28 Thread Sam James
commit: 17e5e6f84483c0d388713e35831d964ffce89efe
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 28 08:54:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 28 08:54:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e5e6f8

net-analyzer/monitoring-plugins: Stabilize 2.3.2-r1 x86, #883793

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c0dfcca5511e..f7df02c50c19 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2023-01-28 Thread Sam James
commit: 81e35201beb18a6d269ac8a1fa6291583f7ddd16
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 28 08:54:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 28 08:54:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e35201

net-analyzer/monitoring-plugins: Stabilize 2.3.2-r1 amd64, #883793

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 27bd712c16c3..c0dfcca5511e 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

2022-12-26 Thread Conrad Kostecki
commit: 2556115ab138a216c9eb021461cce9c81cb493fb
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Dec 26 08:37:02 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Dec 26 13:40:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2556115a

net-analyzer/monitoring-plugins: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28808
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/define-own-mysql-port-constant.patch | 102 -
 1 file changed, 102 deletions(-)

diff --git 
a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch 
b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
deleted file mode 100644
index b7406bc9af80..
--- a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky 
-Date: Fri, 27 Oct 2017 07:58:43 -0400
-Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
- port.
-
-The MYSQL_PORT constant used to be defined in mysql.h, and was used as
-the default port in the two plugins check_mysql and check_mysql_query.
-Now that mysql.h no longer defines that constant, our plugins fail to
-build against newer versions of MySQL and MariaDB.
-
-Since MYSQL_PORT used the "default port" on the local system, it
-actually was not the best choice as the default for the check plugins:
-when monitoring remote MySQL servers, the usual default of 3306 is
-more likely to be correct than whatever the local server happens to be
-listening on.
-
-As a result, we fix the issue by defining our own constant, called
-CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
-check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
-to use the new CHECK_PORT_DEFAULT.
-
-This change is backwards-incompatible: any users who compiled in a
-MYSQL_PORT other than 3306 and who were running their checks on the
-same server as the database will now need to specify that port
-explicitly.
-
-Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508

- plugins/check_mysql.c   | 8 ++--
- plugins/check_mysql_query.c | 8 ++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
-index 5773afd9..c44919d0 100644
 a/plugins/check_mysql.c
-+++ b/plugins/check_mysql.c
-@@ -36,6 +36,10 @@ const char *email = "de...@monitoring-plugins.org";
- 
- #define SLAVERESULTSIZE 70
- 
-+/* The default port that MySQL servers listen on. */
-+#define CHECK_PORT_DEFAULT 3306
-+
-+
- #include "common.h"
- #include "utils.h"
- #include "utils_base.h"
-@@ -58,7 +62,7 @@ char *ciphers = NULL;
- bool ssl = false;
- char *opt_file = NULL;
- char *opt_group = NULL;
--unsigned int db_port = MYSQL_PORT;
-+unsigned int db_port = CHECK_PORT_DEFAULT;
- int check_slave = 0, warn_sec = 0, crit_sec = 0;
- int ignore_auth = 0;
- int verbose = 0;
-@@ -505,7 +509,7 @@ void
- print_help (void)
- {
-   char *myport;
--  xasprintf (&myport, "%d", MYSQL_PORT);
-+  xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
- 
-   print_revision (progname, NP_VERSION);
- 
-diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
-index 49a14dd3..6f492442 100644
 a/plugins/check_mysql_query.c
-+++ b/plugins/check_mysql_query.c
-@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query";
- const char *copyright = "1999-2007";
- const char *email = "de...@monitoring-plugins.org";
- 
-+/* The default port that MySQL servers listen on. */
-+#define CHECK_PORT_DEFAULT 3306
-+
-+
- #include "common.h"
- #include "utils.h"
- #include "utils_base.h"
-@@ -48,7 +52,7 @@ char *db_pass = NULL;
- char *db = NULL;
- char *opt_file = NULL;
- char *opt_group = NULL;
--unsigned int db_port = MYSQL_PORT;
-+unsigned int db_port = CHECK_PORT_DEFAULT;
- 
- int process_arguments (int, char **);
- int validate_arguments (void);
-@@ -299,7 +303,7 @@ void
- print_help (void)
- {
-   char *myport;
--  xasprintf (&myport, "%d", MYSQL_PORT);
-+  xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
- 
-   print_revision (progname, NP_VERSION);
- 
--- 
-2.13.6
-



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-11-30 Thread Michael Orlitzky
commit: 1a5ad2e371f409ab9b41a7f7fedc766dd0fc0c2e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Dec  1 00:46:12 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Dec  1 00:58:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5ad2e3

net-analyzer/monitoring-plugins: new revisions to fix ping path.

We pass explicit ping/ping6 commands to the monitoring-plugins
./configure script to prevent it from running those commands during the
build. However, instead of grabbing their paths from $PATH, we have
(until now) hard-coded them to /bin/ping. This has now bitten us with
net-misc/iputils-20221126.

This commit uses $(command -v ...) to get the right absolute
paths. Thanks to Daniel Pouzzner for reporting the problem and
suggesting the near-identical fix to nagios-plugins. I've made the
changes and revisions to both the ~arch and stable ebuilds to avoid as
much breakage as possible, but we will still need to coordinate the
stabilization of monitoring-plugins-2.3.2-r1 with iputils-20221126.

Closes: https://bugs.gentoo.org/883729
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...-plugins-2.3.1-r3.ebuild => monitoring-plugins-2.3.1-r4.ebuild} | 7 ---
 ...ing-plugins-2.3.2.ebuild => monitoring-plugins-2.3.2-r1.ebuild} | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
similarity index 91%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
index 70689ddedd5c..bee2b77ec739 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
@@ -76,11 +76,12 @@ src_configure() {
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" )
+   # 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="/bin/ping -6 -n -U -w %d -c %d 
%s" )
+   myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w 
%d -c %d %s" )
fi
 
econf \

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
similarity index 91%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
index 68ba0969bbbc..27bd712c16c3 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
@@ -72,11 +72,12 @@ src_configure() {
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" )
+   # 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="/bin/ping -6 -n -U -w %d -c %d 
%s" )
+   myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w 
%d -c %d %s" )
fi
 
econf \



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-11-30 Thread Michael Orlitzky
commit: 821a6d18123a0f24f84404d9e3c76c46f2943f77
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Dec  1 00:50:52 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Dec  1 00:58:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821a6d18

net-analyzer/monitoring-plugins: drop 2.3.1-r2

Signed-off-by: Michael Orlitzky  gentoo.org>

 .../monitoring-plugins-2.3.1-r2.ebuild | 106 -
 1 file changed, 106 deletions(-)

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..
--- 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"
-}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-11-06 Thread Michael Orlitzky
commit: c4246dc349dd70b6573c5ecb8874c7e1a7681c31
Author: Tomáš Mózes  gmail  com>
AuthorDate: Tue Nov  1 08:39:13 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Nov  6 13:56:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4246dc3

net-analyzer/monitoring-plugins: add 2.3.2

Closes: https://github.com/gentoo/gentoo/pull/28067
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../monitoring-plugins-2.3.2.ebuild| 104 +
 2 files changed, 105 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 5d730fce5753..e19b4b8e6a60 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1 +1,2 @@
 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

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild
new file mode 100644
index ..68ba0969bbbc
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild
@@ -0,0 +1,104 @@
+# 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/nag

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-05-03 Thread Arthur Zamarin
commit: 2280dbe87fa3ce2cf93884f4e1b3fc4c6fbecdad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  3 18:09:09 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  3 18:09:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2280dbe8

net-analyzer/monitoring-plugins: Stabilize 2.3.1-r3 sparc, #841689

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 84cb15c887e4..70689ddedd5c 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-04-29 Thread Sam James
commit: 68b51c75e24d8c5ef0b6592be058f47e04175f70
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 19:18:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 19:18:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b51c75

net-analyzer/monitoring-plugins: Stabilize 2.3.1-r3 amd64, #841689

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 8a42d47877a2..84cb15c887e4 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-04-29 Thread Sam James
commit: 391d2501361c4d7cee5c3a0cd544aa7812b70c21
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 19:18:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 19:18:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=391d2501

net-analyzer/monitoring-plugins: Stabilize 2.3.1-r3 x86, #841689

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 56c3ce8e288f..8a42d47877a2 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2022-03-22 Thread Sam James
commit: 1a7cb36c7877053da2c227143db420fa156d0866
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 23 00:36:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 23 00:44:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7cb36c

net-analyzer/monitoring-plugins: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James  gentoo.org>

 ...toring-plugins-2.3.1.ebuild => monitoring-plugins-2.3.1-r2.ebuild} | 4 ++--
 ...ing-plugins-2.3.1-r1.ebuild => monitoring-plugins-2.3.1-r3.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
similarity index 97%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
index 1e9762f79b2b..98c4b1592214 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ REAL_DEPEND="dev-lang/perl
dev-libs/uriparser
net-misc/curl
)
-   ldap? ( net-nds/openldap )
+   ldap? ( net-nds/openldap:= )
mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
postgres? ( dev-db/postgresql:= )
ssl? (

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
similarity index 99%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
index 9c951f0457cf..56c3ce8e288f 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
@@ -28,7 +28,7 @@ REAL_DEPEND="dev-lang/perl
dev-libs/uriparser
net-misc/curl
)
-   ldap? ( net-nds/openldap )
+   ldap? ( net-nds/openldap:= )
mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
postgres? ( dev-db/postgresql:= )
ssl? (



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/, net-analyzer/monitoring-plugins/files/

2022-02-01 Thread Joonas Niilola
commit: c9fa9976a7c5fed79242dd70b2b46b1e07da0152
Author: Tomáš Mózes  gmail  com>
AuthorDate: Sat Jan  8 14:05:43 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb  1 08:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fa9976

net-analyzer/monitoring-plugins: fix check_disk on btrfs

Closes: https://bugs.gentoo.org/830249
Reported-by: satmd  satmd.de
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23700
Signed-off-by: Joonas Niilola  gentoo.org>

 ...onitoring-plugins-fix-check-disk-on-btrfs.patch |  20 
 .../monitoring-plugins-2.3.1-r1.ebuild | 108 +
 2 files changed, 128 insertions(+)

diff --git 
a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
new file mode 100644
index ..cbd458372133
--- /dev/null
+++ 
b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/830249
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1357
+https://github.com/monitoring-plugins/monitoring-plugins/commit/e17c1e9ed95b8b9681dccd5a909ac5a02a04416c
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index 844e625f..a2735195 100644
+--- a/plugins/check_disk.c
 b/plugins/check_disk.c
+@@ -1068,10 +1068,7 @@ get_stats (struct parameter_list *p, struct fs_usage 
*fsp) {
+ 
+ void
+ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
+-  /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
+-  * space on BSD (the actual value should be negative but fsp->fsu_bavail
+-  * is unsigned) */
+-  p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
++  p->available = fsp->fsu_bavail;
+   p->available_to_root = fsp->fsu_bfree;
+   p->used = fsp->fsu_blocks - fsp->fsu_bfree;
+   if (freespace_ignore_reserved) {

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
new file mode 100644
index ..9c951f0457cf
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
@@ -0,0 +1,108 @@
+# 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 -

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-07-15 Thread Conrad Kostecki
commit: d05b5eeac17bba67f5f739397338b4cfed7f3239
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Jul 15 22:11:02 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Jul 15 22:11:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05b5eea

net-analyzer/monitoring-plugins: drop old version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   2 -
 .../monitoring-plugins-2.2-r4.ebuild   | 103 
 .../monitoring-plugins-2.3.ebuild  | 106 -
 3 files changed, 211 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index eadf33d62d4..5d730fce575 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,3 +1 @@
-DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 
0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0
 SHA512 
5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 
8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070
 SHA512 
0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
-DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B 
d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de
 SHA512 
926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
deleted file mode 100644
index 62c9fc03748..000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic user
-
-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="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
-   ldap? ( net-nds/openldap )
-   mysql? ( dev-db/mysql-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}
-   !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 mysql) \
-   $(use_with ipv6) \
-   $(use_with ldap) \
-   $(use_with postgres pgsql /usr) \
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-07-15 Thread Sam James
commit: 1283b498e807a309bcb077c3e83689122f2c76e3
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:42:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:42:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1283b498

net-analyzer/monitoring-plugins: Stabilize 2.3.1 sparc, #802318

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
index 7837d4df440..1e9762f79b2 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-07-15 Thread Sam James
commit: 823e0d3a261845313a45948c54a3a986de71017d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:36:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:38:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823e0d3a

net-analyzer/monitoring-plugins: Stabilize 2.3.1 amd64, #802318

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
index e8cb22dcbf6..7837d4df440 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-07-15 Thread Sam James
commit: 2ad9ef41674b84372c50400a3b68891078568366
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:33:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:33:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad9ef41

net-analyzer/monitoring-plugins: Stabilize 2.3.1 x86, #802318

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
index 8beced67819..e8cb22dcbf6 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-05-10 Thread Michael Orlitzky
commit: c5fa713d209a910923bfd443dd995741a2af724c
Author: Tomáš Mózes  gmail  com>
AuthorDate: Fri May  7 12:56:11 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon May 10 13:21:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fa713d

net-analyzer/monitoring-plugins: bump to 2.3.1

Closes: https://github.com/gentoo/gentoo/pull/20717
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../monitoring-plugins-2.3.1.ebuild| 106 +
 2 files changed, 107 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 81a3504ff20..eadf33d62d4 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,2 +1,3 @@
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 
0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0
 SHA512 
5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
+DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 
8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070
 SHA512 
0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
 DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B 
d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de
 SHA512 
926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
new file mode 100644
index 000..8beced67819
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 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 libcu

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-05-01 Thread Mikle Kolyada
commit: caba140d8678350a3ce5f0871ff8affd8b5fa9e6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May  1 10:00:53 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May  1 10:00:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caba140d

net-analyzer/monitoring-plugins: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild | 5 ++---
 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild| 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
index 5396099961d..62c9fc03748 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
+IUSE="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
@@ -29,8 +29,7 @@ REAL_DEPEND="dev-lang/perl
postgres? ( dev-db/postgresql:= )
ssl? (
!gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
)
gnutls? ( net-libs/gnutls )
)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
index 42c658307a6..8beced67819 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
@@ -12,7 +12,7 @@ 
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 libressl mysql dns fping game postgres radius 
samba snmp ssh +ssl"
+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
@@ -33,8 +33,7 @@ REAL_DEPEND="dev-lang/perl
postgres? ( dev-db/postgresql:= )
ssl? (
!gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
)
gnutls? ( net-libs/gnutls )
)



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-04-03 Thread Sam James
commit: 2bd32d4f526fb667752dd6da91f5115d265baf2b
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  3 19:27:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 19:53:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd32d4f

net-analyzer/monitoring-plugins: eutils--, multilib--

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild | 4 ++--
 net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
index 405873b347c..5396099961d 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic multilib user
+inherit flag-o-matic user
 
 DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
 HOMEPAGE="https://www.monitoring-plugins.org/";

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
index b91919ddf88..42c658307a6 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib
+inherit flag-o-matic
 
 DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
 HOMEPAGE="https://www.monitoring-plugins.org/";



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2021-02-04 Thread Thomas Deutschmann
commit: a0f20085327b74deb47410e5f31ef281be1d5b19
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Feb  4 20:18:11 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Feb  4 22:24:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f20085

net-analyzer/monitoring-plugins: drop old

Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19333
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../monitoring-plugins-2.2-r2.ebuild   | 104 -
 .../monitoring-plugins-2.2-r3.ebuild   | 104 -
 2 files changed, 208 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
deleted file mode 100644
index 3670a8df928..000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib user
-
-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="gnutls ipv6 ldap libressl 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
-   ldap? ( net-nds/openldap )
-   mysql? ( virtual/mysql )
-   postgres? ( dev-db/postgresql:= )
-   ssl? (
-   !gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   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}
-   !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 -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"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-   NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-   enewgroup nagios
-   enewuser nagios -1 /bin/bash /var/nagios/home 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 
${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
-}

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
deleted file mode 100644
index cf357d910b2..000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/, profiles/arch/sparc/

2021-02-04 Thread Thomas Deutschmann
commit: b21fe4f4e55232e4b0d66d3b7a4c3473e5f3e2c7
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Feb  4 20:17:12 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Feb  4 22:24:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21fe4f4

net-analyzer/monitoring-plugins: bump to 2.3

Closes: https://bugs.gentoo.org/766153
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../monitoring-plugins-2.3.ebuild  | 107 +
 profiles/arch/sparc/package.use.mask   |   4 +
 3 files changed, 112 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 8576df0da90..81a3504ff20 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1 +1,2 @@
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 
0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0
 SHA512 
5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
+DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B 
d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de
 SHA512 
926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
new file mode 100644
index 000..b91919ddf88
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib
+
+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 libressl 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? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2020-11-26 Thread Agostino Sarubbo
commit: 006f6c6dbf34ffa7e68b811fdbda7ddfac813e39
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 27 07:57:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 27 07:57:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006f6c6d

net-analyzer/monitoring-plugins: sparc stable wrt bug #757105

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
index a6e7494b680..405873b347c 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2020-11-26 Thread Joonas Niilola
commit: fdd9056827ffaf3da1690cf8820702f4ea8e48f8
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Nov 27 06:34:50 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 27 06:35:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd90568

net-analyzer/monitoring-plugins: stabilize 2.2-r4 on x86

Bug: https://bugs.gentoo.org/757105
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
index 0456f8f..a6e7494b680 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2020-11-26 Thread Joonas Niilola
commit: d858632f30ec07405fe659275755c473ef269c79
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Nov 27 06:34:20 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 27 06:35:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d858632f

net-analyzer/monitoring-plugins: stabilize 2.2-r4 on amd64

Bug: https://bugs.gentoo.org/757105
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
index ae1073c7cae..0456f8f 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2020-04-17 Thread Sergei Trofimovich
commit: 1e77f026575af5dff63cece1420d3313bdab3573
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 17 15:09:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 17 16:24:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e77f026

net-analyzer/monitoring-plugins: drop 2.2-r2 to ~sparc

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index 2e62986bc44..3670a8df928 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2019-03-02 Thread Louis Sautier
commit: 31cbd149b087f323dd75bd0c4db9fefae47a084b
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Feb 27 11:21:43 2019 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Sun Mar  3 00:51:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31cbd149

net-analyzer/monitoring-plugins: make 'check_ping -4' call 'ping -4'

Currently, when calling 'check_ping -4' on a host that has both A and 
records, the  record is used. This is because the IPv4 ping command
is set to 'ping' at configure-time, when it should be 'ping -4'.

For consistency, this commit also changes the IPv6 ping command from
'ping6' to 'ping -6'.

The upstream issue is
https://github.com/monitoring-plugins/monitoring-plugins/issues/898.
Changing the ping command at configure-time was proposed in
https://github.com/monitoring-plugins/monitoring-plugins/pull/1531.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/11169

 .../monitoring-plugins-2.2-r4.ebuild   | 104 +
 1 file changed, 104 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
new file mode 100644
index 000..ae1073c7cae
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+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="gnutls ipv6 ldap libressl 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
+   ldap? ( net-nds/openldap )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   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}
+   !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 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_preinst() {
+   enewgroup nagios
+   enewuser nagios -1 /bin/bash /var/nagios/home 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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-11-17 Thread Sergei Trofimovich
commit: 9c84b9162bdf960d93912a103f458744aef7dd43
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Nov 17 19:40:45 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 17 20:44:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c84b916

net-analyzer/monitoring-plugins: stable 2.2-r3 for sparc, bug #670972

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
index 63def4f9293..cf357d910b2 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-11-17 Thread Mikle Kolyada
commit: 846a33bb4a6dc9bf689373da44e3b6fbdf83bd87
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Nov 17 14:14:10 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Nov 17 14:14:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846a33bb

net-analyzer/monitoring-plugins: amd64 stable wrt bug #670972

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
index 1e9dd91d0b6..63def4f9293 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-11-15 Thread Thomas Deutschmann
commit: 52bc3e1c730327494090634e18f4dabdedb52795
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov 15 15:38:23 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov 15 15:38:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52bc3e1c

net-analyzer/monitoring-plugins: x86 stable (bug #670972)

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
index 52ef5740c27..1e9dd91d0b6 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-09-28 Thread Mikle Kolyada
commit: c975b53a53ba2c134a650ca570971d85cafda747
Author: Tomas Mozes  gmail  com>
AuthorDate: Fri Sep 28 08:00:45 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 28 18:14:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c975b53a

net-analyzer/monitoring-plugins: replace virtual/mysql dependency

Closes: https://bugs.gentoo.org/665948
Signed-off-by: Tomáš Mózes  gmail.com>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/9996

 .../monitoring-plugins-2.2-r3.ebuild   | 104 +
 1 file changed, 104 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
new file mode 100644
index 000..52ef5740c27
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+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="gnutls ipv6 ldap libressl 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
+   ldap? ( net-nds/openldap )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   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}
+   !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 -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"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+   NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+   enewgroup nagios
+   enewuser nagios -1 /bin/bash /var/nagios/home 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 
${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-06-18 Thread Michael Orlitzky
commit: 1d242cda4faf962263102dd58504121851cf28ad
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jun 18 21:51:13 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jun 18 21:56:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d242cda

net-analyzer/monitoring-plugins: remove "unused" versions 2.1.2 and 2.2.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/monitoring-plugins/Manifest   |   1 -
 .../monitoring-plugins-2.1.2.ebuild| 100 -
 .../monitoring-plugins-2.2.ebuild  | 100 -
 3 files changed, 201 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 1fee2b2ce31..8576df0da90 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,2 +1 @@
-DIST monitoring-plugins-2.1.2.tar.gz 2613060 BLAKE2B 
ea352b283166a183b993c474d7318b218e8ba75d2cca91ae1901046e6c4bc2075c21217038a649aaf1355f04d6133a623ee1439fa0d1548c8ec6d03fb8952854
 SHA512 
845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 
0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0
 SHA512 
5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
deleted file mode 100644
index e48fdba5314..000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib user
-
-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 x86"
-IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres 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
-   ldap? ( net-nds/openldap )
-   mysql? ( virtual/mysql )
-   postgres? ( dev-db/postgresql:= )
-   ssl? (
-   !gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   gnutls? ( net-libs/gnutls )
-   )"
-
-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}
-   !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 -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) \
-   "${myconf[@]}" \
-   --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-   --sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-   NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-   enewgroup nagios
-   enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-   elog "Th

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-05-08 Thread Sergei Trofimovich
commit: 8a5f0ec6ecfe8177d8f87de9a3e5f407a28b25c4
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue May  8 19:38:18 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue May  8 21:16:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5f0ec6

net-analyzer/monitoring-plugins: stable 2.2-r2 for sparc

Bug: https://bugs.gentoo.org/654688
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index d0be6977de1..2e62986bc44 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-05-04 Thread Thomas Deutschmann
commit: 53611723137b1e78c7b5df4b18cc6ce288fda31b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May  4 15:33:56 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May  4 15:33:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53611723

net-analyzer/monitoring-plugins: x86 stable (bug #654688)

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index 363d79a912e..d0be6977de1 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-05-04 Thread Agostino Sarubbo
commit: 050f8e14da6d5a78e587fa5335b5977628027b84
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May  4 10:50:19 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May  4 10:50:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=050f8e14

net-analyzer/monitoring-plugins: amd64 stable wrt bug #654688

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index 76e7997e8b7..363d79a912e 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba 
snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2018-02-11 Thread Michał Górny
commit: 62784961ae90d5eb3c9bd4ac2d158ca4291d2b1e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 11:01:21 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 11:01:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62784961

net-analyzer/monitoring-plugins: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 net-analyzer/monitoring-plugins/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/metadata.xml 
b/net-analyzer/monitoring-plugins/metadata.xml
index f355cb420c6..654cb6c8c64 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -4,12 +4,10 @@
   
   hydrapo...@gmail.com
   Tomas Mozes
-  Primary maintainer. Assign bugs to him.
   
   
   m...@gentoo.org
   Michael Orlitzky
-  Secondary maintainer. Please CC on bugs.
   
   
   proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/, net-analyzer/monitoring-plugins/files/

2017-10-27 Thread Michael Orlitzky
commit: 0de961617a6ad772b0280838a8ab9d850846451a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Oct 27 12:41:16 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Oct 27 12:41:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de96161

net-analyzer/monitoring-plugins: new revision to fix build failure with MariaDB.

The latest -r2 adds a patch (which I've sent upstream) to fix a build
failure against newer versions of MariaDB.

Closes: https://bugs.gentoo.org/633548
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../files/define-own-mysql-port-constant.patch | 102 +
 ...-r1.ebuild => monitoring-plugins-2.2-r2.ebuild} |   2 +
 2 files changed, 104 insertions(+)

diff --git 
a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch 
b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
new file mode 100644
index 000..b7406bc9af8
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
@@ -0,0 +1,102 @@
+From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Fri, 27 Oct 2017 07:58:43 -0400
+Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
+ port.
+
+The MYSQL_PORT constant used to be defined in mysql.h, and was used as
+the default port in the two plugins check_mysql and check_mysql_query.
+Now that mysql.h no longer defines that constant, our plugins fail to
+build against newer versions of MySQL and MariaDB.
+
+Since MYSQL_PORT used the "default port" on the local system, it
+actually was not the best choice as the default for the check plugins:
+when monitoring remote MySQL servers, the usual default of 3306 is
+more likely to be correct than whatever the local server happens to be
+listening on.
+
+As a result, we fix the issue by defining our own constant, called
+CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
+check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
+to use the new CHECK_PORT_DEFAULT.
+
+This change is backwards-incompatible: any users who compiled in a
+MYSQL_PORT other than 3306 and who were running their checks on the
+same server as the database will now need to specify that port
+explicitly.
+
+Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
+---
+ plugins/check_mysql.c   | 8 ++--
+ plugins/check_mysql_query.c | 8 ++--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 5773afd9..c44919d0 100644
+--- a/plugins/check_mysql.c
 b/plugins/check_mysql.c
+@@ -36,6 +36,10 @@ const char *email = "de...@monitoring-plugins.org";
+ 
+ #define SLAVERESULTSIZE 70
+ 
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -58,7 +62,7 @@ char *ciphers = NULL;
+ bool ssl = false;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
+ int ignore_auth = 0;
+ int verbose = 0;
+@@ -505,7 +509,7 @@ void
+ print_help (void)
+ {
+   char *myport;
+-  xasprintf (&myport, "%d", MYSQL_PORT);
++  xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+ 
+   print_revision (progname, NP_VERSION);
+ 
+diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
+index 49a14dd3..6f492442 100644
+--- a/plugins/check_mysql_query.c
 b/plugins/check_mysql_query.c
+@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query";
+ const char *copyright = "1999-2007";
+ const char *email = "de...@monitoring-plugins.org";
+ 
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -48,7 +52,7 @@ char *db_pass = NULL;
+ char *db = NULL;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -299,7 +303,7 @@ void
+ print_help (void)
+ {
+   char *myport;
+-  xasprintf (&myport, "%d", MYSQL_PORT);
++  xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+ 
+   print_revision (progname, NP_VERSION);
+ 
+-- 
+2.13.6
+

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
similarity index 97%
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r1.ebuild
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index 951992d4302..76e7997e8b7 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2017-10-22 Thread Michael Orlitzky
commit: 3a4f9177b1a1e4b2c80999baade54480b904d4f6
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Oct 22 19:26:03 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Oct 22 19:55:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4f9177

net-analyzer/monitoring-plugins: new revision adding radius support.

The monitoring-plugins build system has automagic support for radius
that can be disabled via the --without-radius flag. Doing so allows
(or prevents) the check_radius plugin from being built. This new
revision adds "radius" to IUSE for monitoring-plugins, and builds
check_radius (and pulls in its dependencies) only with USE=radius.

Thanks to Martin Samek who noticed the missing flag.

Closes: https://bugs.gentoo.org/634582
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../monitoring-plugins-2.2-r1.ebuild   | 102 +
 1 file changed, 102 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r1.ebuild
new file mode 100644
index 000..951992d4302
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+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="gnutls ipv6 ldap libressl 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
+   ldap? ( net-nds/openldap )
+   mysql? ( virtual/mysql )
+   postgres? ( dev-db/postgresql:= )
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   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}
+   !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 -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"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+   NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+   enewgroup nagios
+   enewuser nagios -1 /bin/bash /var/nagios/home 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 
${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2017-10-18 Thread Sergei Trofimovich
commit: 48b82ac0de1b30f466ab4bab8b4fc24d73795203
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Oct 18 13:24:35 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Oct 18 13:24:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b82ac0

net-analyzer/monitoring-plugins: stable 2.2 for sparc (thanks to Rolf Eike Beer)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
index bcc6146dc81..940ae5f013e 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh 
+ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2017-06-29 Thread Alexis Ballier
commit: 4d6e2e64dfadbb35478327382d3ba86e2847ba97
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun 30 06:01:42 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun 30 06:02:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6e2e64

net-analyzer/monitoring-plugins: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
index 573b7845120..bcc6146dc81 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh 
+ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2017-01-29 Thread Agostino Sarubbo
commit: 92062e73187f510e3c942c3dd58bff7b7bd74c8b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 29 13:55:21 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 29 13:55:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92062e73

net-analyzer/monitoring-plugins: amd64 stable wrt bug #607538

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
index 8e3cd45..2c12928 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh 
+ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2016-12-23 Thread Michael Orlitzky
commit: 97acecd2a67cc1a1da1c29ea98fd6e9592acc6b8
Author: Tomáš Mózes  gmail  com>
AuthorDate: Thu Dec 22 23:56:57 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Dec 23 18:50:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97acecd2

net-analyzer/monitoring-plugins: bump to 2.2

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../monitoring-plugins-2.2.ebuild  | 101 +
 2 files changed, 102 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 46c48c3..53329e6 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1 +1,2 @@
 DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 
76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 
845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed
 WHIRLPOOL 
aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43
+DIST monitoring-plugins-2.2.tar.gz 2461548 SHA256 
296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 SHA512 
5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 WHIRLPOOL 
5ca16cbc63cbbe3472f82b87b2c4111df4877bc33b0a9bf638507aaf8020194adc6e8244c5a002ae636121ae58d7a112cb2c5cba6e384c136e5636bbfc4a6141

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
new file mode 100644
index ..8e3cd45
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+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 ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres 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
+   ldap? ( net-nds/openldap )
+   mysql? ( virtual/mysql )
+   postgres? ( dev-db/postgresql:= )
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   gnutls? ( net-libs/gnutls )
+   )"
+
+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}
+   !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 -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) \
+   "${myconf[@]}" \
+   --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+   --sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+   NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+   enewgroup nagios
+   enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst(

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2016-08-08 Thread Michael Orlitzky
commit: dc84e28155f4fc7af82b0a79b55c48a4fa0d65c2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Aug  9 04:10:56 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug  9 04:10:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc84e281

net-analyzer/monitoring-plugins: remove old v2.1.1.

Package-Manager: portage-2.2.28

 net-analyzer/monitoring-plugins/Manifest   |  1 -
 .../monitoring-plugins-2.1.1.ebuild| 96 --
 2 files changed, 97 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 7be3afa..46c48c3 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,2 +1 @@
-DIST monitoring-plugins-2.1.1.tar.gz 2612331 SHA256 
44dbace8033eafb716cc501bfef26ca9071ae3d0329b2c118bd0230fd98dd1d3 SHA512 
0b5d0aefe4aab938287509fcd20c0bb5a1e79848ef85127bbf33d365e62fd9442d230dc4ac605e5d815b68827550485a2b01973b7527d7e611b0821199ed60aa
 WHIRLPOOL 
8355cec22b8ea540a149f65ea74d16890475b2799db564109ea790fe6d3c2dc9b42af2103594048ea9e6ee3de4041fcc8c45805e53f23de5b8b56e89b77b8ba8
 DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 
76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 
845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed
 WHIRLPOOL 
aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
deleted file mode 100644
index 3a69dae..000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib user
-
-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 x86"
-IUSE="gnutls ipv6 ldap mysql dns fping game postgres 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
-   ldap? ( net-nds/openldap )
-   mysql? ( virtual/mysql )
-   postgres? ( dev-db/postgresql )
-   ssl? (
-   !gnutls? ( dev-libs/openssl )
-   gnutls? ( net-libs/gnutls )
-   )"
-
-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}
-   !net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-src_configure() {
-   # 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 -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) \
-   "${myconf[@]}" \
-   --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-   --sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-   NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-   enewgroup nagios
-   enewuser nagios -1 /bin/bash /var/nagios/home 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 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2016-03-19 Thread Matt Thode
commit: a2428965c4d24caec00ed3b52db63f72a65f4fea
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar 17 19:31:27 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Mar 17 19:31:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2428965

net-analyzer/monitoring-plugins: add arm keyword

Package-Manager: portage-2.2.26

 net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
index 853de30..e04c70a 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh 
+ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2015-11-11 Thread Agostino Sarubbo
commit: ecb3e4c04883431035f27358fe4137de187a69ac
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 11 09:11:40 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 11 09:11:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb3e4c0

net-analyzer/monitoring-plugins: x86 stable wrt bug #553288

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
index 02a4370..3a69dae 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls ipv6 ldap mysql dns fping game postgres samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2015-11-09 Thread Agostino Sarubbo
commit: f3fb142bdb8ac701cfdc78cc0020d54755895751
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Nov  9 10:30:04 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Nov  9 10:30:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3fb142b

net-analyzer/monitoring-plugins: amd64 stable wrt bug #553288

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
index 4e298b5..02a4370 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gnutls ipv6 ldap mysql dns fping game postgres samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/

2015-10-19 Thread Ian Delaney
commit: d4637b58279ff748ad885bc752867e6ee1659d06
Author: Ian Delaney  gentoo  org>
AuthorDate: Mon Oct 19 15:32:35 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Oct 19 15:33:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4637b58

net-analyzer/monitoring-plugins: bump to -2.1.2

ebuild submitted by proxy maintainer via the gentoo bug.
rewrite of test phase, correction of qa issue re the build by gcc,
substitute opensll support with that of libresll

Gentoo bug: #563224

Package-Manager: portage-2.2.20.1

 net-analyzer/monitoring-plugins/Manifest   |   1 +
 .../monitoring-plugins-2.1.2.ebuild| 101 +
 2 files changed, 102 insertions(+)

diff --git a/net-analyzer/monitoring-plugins/Manifest 
b/net-analyzer/monitoring-plugins/Manifest
index 734f671..7be3afa 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1 +1,2 @@
 DIST monitoring-plugins-2.1.1.tar.gz 2612331 SHA256 
44dbace8033eafb716cc501bfef26ca9071ae3d0329b2c118bd0230fd98dd1d3 SHA512 
0b5d0aefe4aab938287509fcd20c0bb5a1e79848ef85127bbf33d365e62fd9442d230dc4ac605e5d815b68827550485a2b01973b7527d7e611b0821199ed60aa
 WHIRLPOOL 
8355cec22b8ea540a149f65ea74d16890475b2799db564109ea790fe6d3c2dc9b42af2103594048ea9e6ee3de4041fcc8c45805e53f23de5b8b56e89b77b8ba8
+DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 
76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 
845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed
 WHIRLPOOL 
aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43

diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild 
b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
new file mode 100644
index 000..853de30
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib user
+
+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 ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres 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
+   ldap? ( net-nds/openldap )
+   mysql? ( virtual/mysql )
+   postgres? ( dev-db/postgresql:= )
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   gnutls? ( net-libs/gnutls )
+   )"
+
+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}
+   !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 -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) \
+   "${myconf[@]}" \
+   --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+   --sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ