| 1 |
commit: 51148f5256d4c1d10138f967a884a6f7aa58fdca |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 30 23:20:19 2022 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 30 23:27:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51148f52 |
| 7 |
|
| 8 |
net-analyzer/nagios-plugins: use ping/ping6 from $PATH in v2.4.2. |
| 9 |
|
| 10 |
We pass explicit ping/ping6 commands to the nagios-plugins ./configure |
| 11 |
script to prevent it from running those commands during the build. |
| 12 |
However, instead of grabbing their paths from $PATH, we have (until now) |
| 13 |
hard-coded them to /bin/ping and /bin/ping6. This has now bitten us with |
| 14 |
net-misc/iputils-20221126. |
| 15 |
|
| 16 |
This commit uses $(command -v ...) to get the right absolute |
| 17 |
paths. Thanks to Daniel Pouzzner for reporting the problem and |
| 18 |
suggesting the fix. |
| 19 |
|
| 20 |
Closes: https://bugs.gentoo.org/883765 |
| 21 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 22 |
|
| 23 |
net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild | 7 ++++--- |
| 24 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 25 |
|
| 26 |
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild |
| 27 |
index 7b20af18afa6..8fe32f3ad69a 100644 |
| 28 |
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild |
| 29 |
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2.ebuild |
| 30 |
@@ -83,11 +83,12 @@ src_configure() { |
| 31 |
fi |
| 32 |
|
| 33 |
# The autodetection for these two commands can hang if localhost is |
| 34 |
- # down or ICMP traffic is filtered. Bug #468296. |
| 35 |
- myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) |
| 36 |
+ # down or ICMP traffic is filtered (bug #468296). But also the path |
| 37 |
+ # likes to move around on us (bug #883765). |
| 38 |
+ myconf+=( --with-ping-command="$(command -v ping) -n -U -w %d -c %d %s" ) |
| 39 |
|
| 40 |
if use ipv6; then |
| 41 |
- myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) |
| 42 |
+ myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" ) |
| 43 |
fi |
| 44 |
|
| 45 |
econf \ |
Archives