From 6ea11641c6def346717dd68b726a67c4fa3fe882 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 30 2021 18:37:26 +0000
Subject: import iputils-20180629-7.el8


---

diff --git a/SOURCES/fix-incorrect-statistics.patch b/SOURCES/fix-incorrect-statistics.patch
new file mode 100644
index 0000000..efd719e
--- /dev/null
+++ b/SOURCES/fix-incorrect-statistics.patch
@@ -0,0 +1,25 @@
+From 445826446c32035b3c8e8a7780c4e4b885f0f98f Mon Sep 17 00:00:00 2001
+From: Jan Macku <jamacku@redhat.com>
+Date: Mon, 7 Dec 2020 15:08:14 +0100
+Subject: [PATCH] ping: Fix incorrect statistics
+
+---
+ ping_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ping_common.c b/ping_common.c
+index 040bf23..02cb5e1 100644
+--- a/ping_common.c
++++ b/ping_common.c
+@@ -934,7 +934,7 @@ void finish(void)
+ 		printf(", %g%% packet loss",
+ 		       (float) ((((long long)(ntransmitted - nreceived)) * 100.0) /
+ 			      ntransmitted));
+-		printf(", time %ldms", (1000*tv.tv_sec+tv.tv_usec+500)/1000);
++		printf(", time %ldms", 1000*tv.tv_sec+(tv.tv_usec+500)/1000);
+ 	}
+ 	putchar('\n');
+ 
+-- 
+2.28.0
+
diff --git a/SPECS/iputils.spec b/SPECS/iputils.spec
index a5031d4..59cbab0 100644
--- a/SPECS/iputils.spec
+++ b/SPECS/iputils.spec
@@ -3,7 +3,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20180629
-Release: 2%{?dist}
+Release: 7%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
@@ -21,6 +21,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
+Patch3: fix-incorrect-statistics.patch
 
 %if ! 0%{?_module_build}
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -62,6 +63,7 @@ cp %{SOURCE4} %{SOURCE5} .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifarch s390 s390x
@@ -165,10 +167,25 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir}
 %endif
 
 %changelog
+* Wed Feb 17 2021 Jan Macku <jamacku@redhat.com> - 20180629-7
+- Revert patch introduced by #1852638 (#1928179)
+
+* Tue Dec 15 2020 Jan Macku <jamacku@redhat.com> - 20180629-6
+- Exit on error (#1852638)
+
+* Thu Dec 10 2020 Jan Macku <jamacku@redhat.com> - 20180629-5
+- Change error() -> fprintf() reported by covscan (#1852638)
+
+* Wed Dec 09 2020 Jan Macku <jamacku@redhat.com> - 20180629-4
+- Fix infinite loop caused by subsecond timeouts (#1852638)
+
+* Tue Dec 08 2020 Jan Macku <jamacku@redhat.com> - 20180629-3
+- Fix incorrect ping statistics (#1901780)
+
 * Wed Jul 10 2019 Jan Synáček <jsynacek@redhat.com> - 20180629-2
 - covscan fix (#1606968)
 
-* Tue Jul  3 2018 Jan Synáček <jsynacek@redhat.com> - 20180629-1
+* Tue Jul 03 2018 Jan Synáček <jsynacek@redhat.com> - 20180629-1
 - update to s20180629 (#1596893)
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20161105-9