pool/iputils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 724875 from home:mwilck:branches:network:utilities

Browse Source 
- Fix arping -D problem (bsc#1146440)
 * added arping-revert-partially-fix-sent-vs-received-package.patch
 (upstream commit 18f14be)

OBS-URL: https://build.opensuse.org/request/show/724875
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=76
This commit is contained in:
Marcus Meissner 2019-08-23 13:03:57 +00:00 committed by Git OBS Bridge
parent aaad44df4d
commit 74f031719a
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arping-revert-partially-fix-sent-vs-received-package.patch Normal file
View File

@ -0,0 +1,37 @@
From 18f14be80466ddc8fb17a400be82764a779c8dcd Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 31 Jul 2019 21:28:12 +0100
Subject: [PATCH] arping: revert partially - fix sent vs received packages
return value
Commit 84ca65ca980315c73f929fed8b6f16bbd698c3a0 caused regression. The
arping -D needs return value evaluation that was the earlier default, in
other cases the new return value should be correct.
Addresses: https://github.com/iputils/iputils/issues/209
See-also: https://github.com/void-linux/void-packages/issues/13304
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
arping.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arping.c b/arping.c
index 77c9c56..2c87c15 100644
--- a/arping.c
+++ b/arping.c
@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl)
close(tfd);
freeifaddrs(ctl->ifa0);
rc |= finish(ctl);
- rc |= (ctl->sent != ctl->received);
+ if (ctl->dad && ctl->quit_on_reply)
+ /* Duplicate address detection mode return value */
+ rc |= !(ctl->brd_sent != ctl->received);
+ else
+ rc |= (ctl->sent != ctl->received);
return rc;
}
--
2.22.0

7
iputils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 20 17:31:48 UTC 2019 - Martin Wilck <mwilck@suse.com>
- Fix arping -D problem (bsc#1146440)
* added arping-revert-partially-fix-sent-vs-received-package.patch
(upstream commit 18f14be)
-------------------------------------------------------------------
Fri Jul 26 06:19:44 UTC 2019 - Petr Vorel <pvorel@suse.cz>

2
iputils.spec
View File

@ -27,6 +27,7 @@ Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz
Source1: rarpd.service
Patch1: iputils-sec-ping-unblock.diff
Patch2: iputils-ping-interrupt.diff
Patch3: arping-revert-partially-fix-sent-vs-received-package.patch
BuildRequires: docbook5-xsl-stylesheets
BuildRequires: docbook_5
BuildRequires: iso_ent
@ -67,6 +68,7 @@ out their IP addresses.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
# Export CFLAGS so we can also benefit from the ones the Makefile sets for us