From 4d6327e64905a070b5665e6774a5e5ffeab92870 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Tue, 3 Nov 2020 05:30:11 +0800
Subject: [PATCH 1/2] [patch tracking] 20201103053007654140 -
 https://github.com/iputils/iputils/commit/86ed08936d49e2c81ef49dfbd02aca1c74d0c098

---
 ...08936d49e2c81ef49dfbd02aca1c74d0c098.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch

diff --git a/86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch b/86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch
new file mode 100644
index 0000000..07d8506
--- /dev/null
+++ b/86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch
@@ -0,0 +1,34 @@
+diff --git a/arping.c b/arping.c
+index a002786..53fdbb4 100644
+--- a/arping.c
++++ b/arping.c
+@@ -968,7 +968,7 @@ int main(int argc, char **argv)
+ 		}
+ 		memset(&saddr, 0, sizeof(saddr));
+ 		saddr.sin_family = AF_INET;
+-		if (!ctl.unsolicited && (ctl.source || ctl.gsrc.s_addr)) {
++		if (ctl.source || ctl.gsrc.s_addr) {
+ 			saddr.sin_addr = ctl.gsrc;
+ 			if (bind(probe_fd, (struct sockaddr *)&saddr, sizeof(saddr)) == -1)
+ 				error(2, errno, "bind");
+@@ -979,12 +979,14 @@ int main(int argc, char **argv)
+ 			saddr.sin_port = htons(1025);
+ 			saddr.sin_addr = ctl.gdst;
+ 
+-			if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *)&on, sizeof(on)) == -1)
+-				error(0, errno, _("WARNING: setsockopt(SO_DONTROUTE)"));
+-			if (connect(probe_fd, (struct sockaddr *)&saddr, sizeof(saddr)) == -1)
+-				error(2, errno, "connect");
+-			if (getsockname(probe_fd, (struct sockaddr *)&saddr, &alen) == -1)
+-				error(2, errno, "getsockname");
++			if (!ctl.unsolicited) {
++				if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *)&on, sizeof(on)) == -1)
++					error(0, errno, _("WARNING: setsockopt(SO_DONTROUTE)"));
++				if (connect(probe_fd, (struct sockaddr *)&saddr, sizeof(saddr)) == -1)
++					error(2, errno, "connect");
++				if (getsockname(probe_fd, (struct sockaddr *)&saddr, &alen) == -1)
++					error(2, errno, "getsockname");
++			}
+ 			ctl.gsrc = saddr.sin_addr;
+ 		}
+ 		close(probe_fd);
-- 
Gitee


From 8d8cb36693caf26e69afe073efd7c6d0aab1b8da Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Tue, 3 Nov 2020 05:30:12 +0800
Subject: [PATCH 2/2] [patch tracking] 20201103053007654140 - update spec file

---
 iputils.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/iputils.spec b/iputils.spec
index 60bfdff..35e1b59 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,6 +1,6 @@
 Name:            iputils
 Version:         20190709
-Release:         4
+Release:         5
 Summary:         Network monitoring tools including ping
 License:         BSD and GPLv2+
 URL:             https://github.com/iputils/iputils
@@ -17,6 +17,7 @@ Patch0002:       0001-iputils-arpings.patch
 Patch0003:       0002-iputils-arpings-count.patch
 Patch0004:       bugfix-arping-w-does-not-take-effect.patch
 Patch0005:       0003-ninfod-change-variable-name-to-avoid-colliding.patch
+Patch6000: 86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch
 
 BuildRequires:   gcc meson libidn2-devel openssl-devel libcap-devel libxslt
 BuildRequires:   docbook5-style-xsl systemd glibc-kernheaders gettext
@@ -97,6 +98,9 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* 20201103053007654140 patch-tracking 20190709-5
+- append patch file of upstream repository from <86ed08936d49e2c81ef49dfbd02aca1c74d0c098> to <86ed08936d49e2c81ef49dfbd02aca1c74d0c098>
+
 * Tue Jul 07 2020 gaihuiying <gaihuiying1@huawei.com> - 20190709-4
 - Type:bugfix
 - Id:NA
@@ -128,4 +132,4 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 - DESC:add the softlink for arping
 
 * Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 20190515-1
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee