packages/iputils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 [patch tracking] 20201103053007654140

Browse Source 
From: @openeuler-ci-bot
Reviewed-by: @MrRlu
Signed-off-by: @MrRlu
This commit is contained in:
openeuler-ci-bot 2020-11-23 17:11:18 +08:00 committed by Gitee
commit 79ec42ff4f
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch Normal file
View File

@ -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);

8
iputils.spec
View File

@ -1,6 +1,6 @@
Name: iputils Name: iputils
Version: 20190709 Version: 20190709
Release: 4 Release: 5
Summary: Network monitoring tools including ping Summary: Network monitoring tools including ping
License: BSD and GPLv2+ License: BSD and GPLv2+
URL: https://github.com/iputils/iputils URL: https://github.com/iputils/iputils
@ -17,6 +17,7 @@ Patch0002: 0001-iputils-arpings.patch
Patch0003: 0002-iputils-arpings-count.patch Patch0003: 0002-iputils-arpings-count.patch
Patch0004: bugfix-arping-w-does-not-take-effect.patch Patch0004: bugfix-arping-w-does-not-take-effect.patch
Patch0005: 0003-ninfod-change-variable-name-to-avoid-colliding.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: gcc meson libidn2-devel openssl-devel libcap-devel libxslt
BuildRequires: docbook5-style-xsl systemd glibc-kernheaders gettext 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 %{_mandir}/man8/*.8.gz
%changelog %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 * Tue Jul 07 2020 gaihuiying <gaihuiying1@huawei.com> - 20190709-4
- Type:bugfix - Type:bugfix
- Id:NA - Id:NA
@ -128,4 +132,4 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
- DESC:add the softlink for arping - DESC:add the softlink for arping
* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 20190515-1 * Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 20190515-1
- Package init - Package init