summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-04-07 20:04:59 +0200
committerThomas Deutschmann <whissi@gentoo.org>2020-04-07 20:09:23 +0200
commit23a95c6869f3abe76afd4197e4b7f92d25048861 (patch)
tree1e18ac42d3a6bbf9c4dac1b13c34244e0885d3a4 /net-misc/iputils/files
parentnet-im/zoom: Version bump to 3.5.382995.0407. (diff)
downloadgentoo-23a95c6869f3abe76afd4197e4b7f92d25048861.tar.gz
gentoo-23a95c6869f3abe76afd4197e4b7f92d25048861.tar.bz2
gentoo-23a95c6869f3abe76afd4197e4b7f92d25048861.zip
net-misc/iputils: fix arping
Closes: https://bugs.gentoo.org/692982 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'net-misc/iputils/files')
-rw-r--r--net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch b/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch
new file mode 100644
index 000000000000..715ed45041b5
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch
@@ -0,0 +1,34 @@
+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;
+ }
+