Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins/
Date: Thu, 01 Dec 2022 00:35:57
Message-Id: 1669854819.1d465e3780420afcaeeb5e9e76d1bbb5428d94f5.mjo@gentoo
1 commit: 1d465e3780420afcaeeb5e9e76d1bbb5428d94f5
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 1 00:31:18 2022 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 1 00:33:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d465e37
7
8 net-analyzer/nagios-plugins: yet another ping-related stable revision.
9
10 It turns out that the new revision to force a rebuild doesn't help
11 unless you actually include the path detection fix along with it.
12
13 Bug: https://bugs.gentoo.org/883765
14 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
15
16 ...gios-plugins-2.4.0-r1.ebuild => nagios-plugins-2.4.0-r2.ebuild} | 7 ++++---
17 1 file changed, 4 insertions(+), 3 deletions(-)
18
19 diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild
20 similarity index 91%
21 rename from net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r1.ebuild
22 rename to net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild
23 index 32f8cfa80212..ea52cc31e226 100644
24 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r1.ebuild
25 +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild
26 @@ -87,11 +87,12 @@ src_configure() {
27 fi
28
29 # The autodetection for these two commands can hang if localhost is
30 - # down or ICMP traffic is filtered. Bug #468296.
31 - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
32 + # down or ICMP traffic is filtered (bug #468296). But also the path
33 + # likes to move around on us (bug #883765).
34 + myconf+=( --with-ping-command="$(command -v ping) -n -U -w %d -c %d %s" )
35
36 if use ipv6; then
37 - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
38 + myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" )
39 fi
40
41 econf \