From 861b218e64e21d22db81cd893c0ded253995acff Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 17:53:47 -0500 Subject: [PATCH] import iputils-20180629-2.el8 --- SOURCES/iputils-freeaddrinfo.patch | 14 ++++++++++++++ SPECS/iputils.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 SOURCES/iputils-freeaddrinfo.patch diff --git a/SOURCES/iputils-freeaddrinfo.patch b/SOURCES/iputils-freeaddrinfo.patch new file mode 100644 index 0000000..e814c43 --- /dev/null +++ b/SOURCES/iputils-freeaddrinfo.patch @@ -0,0 +1,14 @@ +--- a/ping.c 2018-06-29 20:00:46.000000000 +0200 ++++ b/ping.c 2019-07-10 09:50:06.653039073 +0200 +@@ -589,8 +589,10 @@ int ping4_run(int argc, char **argv, str + strncpy(hnamebuf, ai->ai_canonname, sizeof hnamebuf - 1); + hostname = hnamebuf; + +- if (result) ++ if (result) { + freeaddrinfo(result); ++ ai = NULL; ++ } + } + if (argc > 1) + route[nroute++] = whereto.sin_addr.s_addr; diff --git a/SPECS/iputils.spec b/SPECS/iputils.spec index 9ca976c..a5031d4 100644 --- a/SPECS/iputils.spec +++ b/SPECS/iputils.spec @@ -3,7 +3,7 @@ Summary: Network monitoring tools including ping Name: iputils Version: 20180629 -Release: 1%{?dist} +Release: 2%{?dist} # some parts are under the original BSD (ping.c) # some are under GPLv2+ (tracepath.c) License: BSD and GPLv2+ @@ -20,6 +20,7 @@ Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Patch0: iputils-rh.patch Patch1: iputils-ifenslave.patch +Patch2: iputils-freeaddrinfo.patch %if ! 0%{?_module_build} BuildRequires: docbook-utils perl-SGMLSpm @@ -60,6 +61,7 @@ cp %{SOURCE4} %{SOURCE5} . %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %ifarch s390 s390x @@ -163,6 +165,9 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir} %endif %changelog +* Wed Jul 10 2019 Jan Synáček - 20180629-2 +- covscan fix (#1606968) + * Tue Jul 3 2018 Jan Synáček - 20180629-1 - update to s20180629 (#1596893)