| 1 |
commit: 1a5ad2e371f409ab9b41a7f7fedc766dd0fc0c2e |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 00:46:12 2022 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 00:58:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5ad2e3 |
| 7 |
|
| 8 |
net-analyzer/monitoring-plugins: new revisions to fix ping path. |
| 9 |
|
| 10 |
We pass explicit ping/ping6 commands to the monitoring-plugins |
| 11 |
./configure script to prevent it from running those commands during the |
| 12 |
build. However, instead of grabbing their paths from $PATH, we have |
| 13 |
(until now) hard-coded them to /bin/ping. 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 near-identical fix to nagios-plugins. I've made the |
| 19 |
changes and revisions to both the ~arch and stable ebuilds to avoid as |
| 20 |
much breakage as possible, but we will still need to coordinate the |
| 21 |
stabilization of monitoring-plugins-2.3.2-r1 with iputils-20221126. |
| 22 |
|
| 23 |
Closes: https://bugs.gentoo.org/883729 |
| 24 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 25 |
|
| 26 |
...-plugins-2.3.1-r3.ebuild => monitoring-plugins-2.3.1-r4.ebuild} | 7 ++++--- |
| 27 |
...ing-plugins-2.3.2.ebuild => monitoring-plugins-2.3.2-r1.ebuild} | 7 ++++--- |
| 28 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 29 |
|
| 30 |
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 |
| 31 |
similarity index 91% |
| 32 |
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild |
| 33 |
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild |
| 34 |
index 70689ddedd5c..bee2b77ec739 100644 |
| 35 |
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild |
| 36 |
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild |
| 37 |
@@ -76,11 +76,12 @@ src_configure() { |
| 38 |
fi |
| 39 |
|
| 40 |
# The autodetection for these two commands can hang if localhost is |
| 41 |
- # down or ICMP traffic is filtered. Bug #468296. |
| 42 |
- myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) |
| 43 |
+ # down or ICMP traffic is filtered (bug #468296). But also the path |
| 44 |
+ # likes to move around on us (bug #883729). |
| 45 |
+ myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" ) |
| 46 |
|
| 47 |
if use ipv6; then |
| 48 |
- myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) |
| 49 |
+ myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) |
| 50 |
fi |
| 51 |
|
| 52 |
econf \ |
| 53 |
|
| 54 |
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 |
| 55 |
similarity index 91% |
| 56 |
rename from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild |
| 57 |
rename to net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild |
| 58 |
index 68ba0969bbbc..27bd712c16c3 100644 |
| 59 |
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild |
| 60 |
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild |
| 61 |
@@ -72,11 +72,12 @@ src_configure() { |
| 62 |
fi |
| 63 |
|
| 64 |
# The autodetection for these two commands can hang if localhost is |
| 65 |
- # down or ICMP traffic is filtered. Bug #468296. |
| 66 |
- myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) |
| 67 |
+ # down or ICMP traffic is filtered (bug #468296). But also the path |
| 68 |
+ # likes to move around on us (bug #883729). |
| 69 |
+ myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" ) |
| 70 |
|
| 71 |
if use ipv6; then |
| 72 |
- myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) |
| 73 |
+ myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) |
| 74 |
fi |
| 75 |
|
| 76 |
econf \ |
Archives