Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at 2019-09-20 14:37:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iputils (Old) and /work/SRC/openSUSE:Factory/.iputils.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iputils" Fri Sep 20 14:37:51 2019 rev:50 rq:729390 version:s20190709 Changes: -------- --- /work/SRC/openSUSE:Factory/iputils/iputils.changes 2019-08-28 16:01:22.922801404 +0200 +++ /work/SRC/openSUSE:Factory/.iputils.new.7948/iputils.changes 2019-09-20 14:37:52.567063197 +0200 @@ -1,0 +2,7 @@ +Fri Sep 6 12:01:34 UTC 2019 - Petr Vorel <[email protected]> + +- Fix arping -w problem (https://github.com/iputils/iputils/issues/211) + * added arping-fix-f-quit-on-first-reply-regression.patch + (upstream commit 1df5350) + +------------------------------------------------------------------- New: ---- arping-fix-f-quit-on-first-reply-regression.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.TvL0a0/_old 2019-09-20 14:37:53.035063110 +0200 +++ /var/tmp/diff_new_pack.TvL0a0/_new 2019-09-20 14:37:53.035063110 +0200 @@ -28,6 +28,7 @@ Patch1: iputils-sec-ping-unblock.diff Patch2: iputils-ping-interrupt.diff Patch3: arping-revert-partially-fix-sent-vs-received-package.patch +Patch4: arping-fix-f-quit-on-first-reply-regression.patch BuildRequires: docbook5-xsl-stylesheets BuildRequires: docbook_5 BuildRequires: iso_ent @@ -69,6 +70,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # Export CFLAGS so we can also benefit from the ones the Makefile sets for us ++++++ arping-fix-f-quit-on-first-reply-regression.patch ++++++ >From 1df5350bdc952b14901fde356b17b78c2bcd4cff Mon Sep 17 00:00:00 2001 From: Sami Kerola <[email protected]> Date: Wed, 28 Aug 2019 20:05:22 +0100 Subject: [PATCH] arping: fix -f quit on first reply regression When arping runs together with -f 'quit on first reply' and -w <timeout> 'how long to wait for a reply' the command needs to exit if replies are not received after wait period. Notice that the exit in case of lost packages will be 1 signifying failure. Getting a reply results to 0 exit value. Addresses: https://bugs.debian.org/935946 Reported-by: Lucas Nussbaum <[email protected]> Addresses: https://github.com/iputils/iputils/issues/211 Reported-by: Noah Meyerhans <[email protected]> Broken-since: 67e070d08dcbec990e1178360f82b3e2ca4f6d5f Signed-off-by: Sami Kerola <[email protected]> Signed-off-by: Petr Vorel <[email protected]> --- arping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arping.c b/arping.c index 2c87c15..30884f6 100644 --- a/arping.c +++ b/arping.c @@ -764,7 +764,8 @@ static int event_loop(struct run_state *ctl) continue; } total_expires += exp; - if (0 < ctl->count && (uint64_t)ctl->count < total_expires) { + if ((0 < ctl->count && (uint64_t)ctl->count < total_expires) || + (ctl->quit_on_reply && ctl->timeout < total_expires)) { exit_loop = 1; continue; } -- 2.22.1
