diff --git a/86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch b/86ed08936d49e2c81ef49dfbd02aca1c74d0c098.patch new file mode 100644 index 0000000000000000000000000000000000000000..07d85067d2134f48b433930be9ef109b3300e38a --- /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); diff --git a/iputils.spec b/iputils.spec index 60bfdff573398de2e8aae12e021d7166fbdcc2c0..35e1b599d112b3c238384982b302de6b15520556 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 - 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 - 20190515-1 -- Package init +- Package init \ No newline at end of file