diff --git a/0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch b/0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch deleted file mode 100644 index 7a669f7..0000000 --- a/0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3b013f271931c3fe771e5a2c591f35d617de90f3 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Thu, 16 May 2019 10:08:50 +0000 -Subject: [PATCH] build-sys/doc: Fix the dependency on xsltproc - -This dependency is only required if either the man pages or the HTML -documentation is being build. Both targets require docbook-xsl-ns and -not docbook-xsl (the former is preferred and in use since c503834). ---- - .travis.yml | 1 - - doc/meson.build | 27 +++++++++++++++++---------- - 2 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 54edb61..6a6e8c3 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -14,7 +14,6 @@ addons: - - "libidn2-0-dev" - - "nettle-dev" - - "xsltproc" -- - "docbook-xsl" - - "docbook-xsl-ns" - matrix: - include: -diff --git a/doc/meson.build b/doc/meson.build -index 369090f..9a007b3 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -38,7 +38,7 @@ if build_ninfod == true - manpages += ['ninfod'] - endif - --xsltproc = find_program('xsltproc', required : true) -+xsltproc = find_program('xsltproc', required : build_mans or build_html_mans) - xsltproc_args = [ - '--nonet', - '--stringparam', 'man.output.quietly', '1', -@@ -48,19 +48,26 @@ xsltproc_args = [ - ] - - if xsltproc.found() -- xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' -- testrun = run_command([xsltproc, '--nonet', xsl]) -- xsltproc_works = testrun.returncode() == 0 -- if xsltproc_works == false -- warning('xsltproc: cannot process ' + xsl) -+ doc_targets = [] -+ if build_mans -+ doc_targets += ['manpages'] - endif --else -- warning('No docbook stylesheet found for generating man pages') -- xsltproc_works = false -+ if build_html_mans -+ doc_targets += ['html'] -+ endif -+ xsltproc_works = true -+ foreach doc_target : doc_targets -+ xsl = 'http://docbook.sourceforge.net/release/xsl-ns/current/' + doc_target + '/docbook.xsl' -+ testrun = run_command([xsltproc, '--nonet', xsl]) -+ if testrun.returncode() != 0 -+ xsltproc_works = false -+ warning('xsltproc: cannot process ' + xsl) -+ endif -+ endforeach - endif - - if xsltproc_works == false -- error('Man pages cannot be built: xsltproc does not work correctly') -+ error('Docs cannot be built: xsltproc does not work correctly') - endif - - if build_mans --- -2.20.1 - diff --git a/0001-iputils-arpings.patch b/0001-iputils-arpings.patch new file mode 100644 index 0000000..54b5542 --- /dev/null +++ b/0001-iputils-arpings.patch @@ -0,0 +1,33 @@ +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; + } diff --git a/0002-iputils-arpings-count.patch b/0002-iputils-arpings-count.patch new file mode 100644 index 0000000..07f2143 --- /dev/null +++ b/0002-iputils-arpings-count.patch @@ -0,0 +1,34 @@ +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 +--- + 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; + } diff --git a/iputils-s20190515.tar.gz b/iputils-s20190515.tar.gz deleted file mode 100644 index dfc4d31..0000000 Binary files a/iputils-s20190515.tar.gz and /dev/null differ diff --git a/iputils-s20190709.tar.gz b/iputils-s20190709.tar.gz new file mode 100644 index 0000000..a2cac03 Binary files /dev/null and b/iputils-s20190709.tar.gz differ diff --git a/iputils.spec b/iputils.spec index 9d4ccb6..6192562 100644 --- a/iputils.spec +++ b/iputils.spec @@ -1,6 +1,6 @@ Name: iputils -Version: 20190515 -Release: 2 +Version: 20190709 +Release: 1 Summary: Network monitoring tools including ping License: BSD and GPLv2+ URL: https://github.com/iputils/iputils @@ -12,9 +12,11 @@ Source3: ninfod.service Source4: bsd.txt Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt -Patch001: 0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch Patch100: iputils-ifenslave.patch +Patch6000: 0001-iputils-arpings.patch +Patch6001: 0002-iputils-arpings-count.patch + BuildRequires: gcc meson libidn2-devel openssl-devel libcap-devel libxslt BuildRequires: docbook5-style-xsl systemd glibc-kernheaders gettext %{?systemd_ordering} @@ -35,8 +37,9 @@ the target machine is alive and receiving network traffic. %setup -q -a 1 -n %{name}-s%{version} cp %{SOURCE4} %{SOURCE5} . -%patch001 -p1 -%patch100 -p1 +%patch100 -p1 +%patch6000 -p1 +%patch6001 -p1 %build export CFLAGS="-fpie" @@ -91,6 +94,12 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ %{_mandir}/man8/*.8.gz %changelog +* Wed Oct 9 2019 openEuler Buildteam - 20190709-1 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:bugfix the arping and ping6 + * Mon Sep 30 2019 openEuler Buildteam - 20190515-2 - Type:bugfix - Id:NA