diff --git a/arping-fix-f-quit-on-first-reply-regression.patch b/arping-fix-f-quit-on-first-reply-regression.patch deleted file mode 100644 index c4495f3..0000000 --- a/arping-fix-f-quit-on-first-reply-regression.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1df5350bdc952b14901fde356b17b78c2bcd4cff Mon Sep 17 00:00:00 2001 -From: Sami Kerola -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 -'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 -Addresses: https://github.com/iputils/iputils/issues/211 -Reported-by: Noah Meyerhans -Broken-since: 67e070d08dcbec990e1178360f82b3e2ca4f6d5f -Signed-off-by: Sami Kerola -Signed-off-by: Petr Vorel ---- - 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 - diff --git a/arping-revert-partially-fix-sent-vs-received-package.patch b/arping-revert-partially-fix-sent-vs-received-package.patch deleted file mode 100644 index 7bb1ec5..0000000 --- a/arping-revert-partially-fix-sent-vs-received-package.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 18f14be80466ddc8fb17a400be82764a779c8dcd Mon Sep 17 00:00:00 2001 -From: Sami Kerola -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 ---- - 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 - diff --git a/iputils.changes b/iputils.changes index 03161fb..4352df6 100644 --- a/iputils.changes +++ b/iputils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 24 07:06:40 UTC 2020 - Petr Vorel + +- Update to version s20200821 + https://github.com/iputils/iputils/releases/tag/s20200821 +- Remove BuildRequires libopenssl-devel (added md5 implementation thus not needed) +- Remove patches from this release + (arping-revert-partially-fix-sent-vs-received-package.patch, + arping-fix-f-quit-on-first-reply-regression.patch) + ------------------------------------------------------------------- Fri Aug 14 14:18:41 UTC 2020 - Petr Vorel diff --git a/iputils.spec b/iputils.spec index 0cfc222..9913166 100644 --- a/iputils.spec +++ b/iputils.spec @@ -17,7 +17,7 @@ Name: iputils -Version: s20190709 +Version: s20200821 Release: 0 Summary: IPv4 and IPv6 Networking Utilities License: BSD-3-Clause AND GPL-2.0-or-later @@ -25,14 +25,11 @@ Group: Productivity/Networking/Other URL: https://github.com/iputils/iputils Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz Source1: rarpd.service -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 BuildRequires: libcap-devel BuildRequires: libcap-progs -BuildRequires: libopenssl-devel BuildRequires: meson BuildRequires: opensp BuildRequires: perl-SGMLS diff --git a/s20190709.tar.gz b/s20190709.tar.gz deleted file mode 100644 index dbe9e28..0000000 --- a/s20190709.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a -size 404101 diff --git a/s20200821.tar.gz b/s20200821.tar.gz new file mode 100644 index 0000000..985d972 --- /dev/null +++ b/s20200821.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b +size 504852