From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1462134-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 61DDA158020
for <garchives@archives.gentoo.org>; Thu, 1 Dec 2022 01:00:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7FFC9E07C5;
Thu, 1 Dec 2022 01:00:53 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 67163E07C5
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Dec 2022 01:00:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 39322340F4B
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Dec 2022 01:00:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 782E7692
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Dec 2022 01:00:50 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1669856322.1a5ad2e371f409ab9b41a7f7fedc766dd0fc0c2e.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild
X-VCS-Directories: net-analyzer/monitoring-plugins/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 1a5ad2e371f409ab9b41a7f7fedc766dd0fc0c2e
X-VCS-Branch: master
Date: Thu, 1 Dec 2022 01:00:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 13a8eac3-b790-40b8-9ef8-180e21597e89
X-Archives-Hash: 6d008e3abc827ad566a138794c389d02
commit: 1a5ad2e371f409ab9b41a7f7fedc766dd0fc0c2e
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 00:46:12 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 00:58:42 2022 +0000
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 <mjo <AT> 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 \