rpms/iputils/devel iputils-20071127-output.patch, NONE, 1.1 iputils.spec, 1.58, 1.59
Martin Nagy (mnagy)
fedora-extras-commits at redhat.com
Tue Mar 25 14:01:10 UTC 2008
- Previous message (by thread): rpms/python-kaa-base/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 python-kaa-base.spec, 1.7, 1.8
- Next message (by thread): rpms/at/devel nonposix.patch,NONE,1.1 at.spec,1.64,1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mnagy
Update of /cvs/extras/rpms/iputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28837
Modified Files:
iputils.spec
Added Files:
iputils-20071127-output.patch
Log Message:
* Tue Mar 25 2008 Martin Nagy <mnagy at redhat.com> - 20071127-2
- fix inconsistent behaviour of ping (#360881)
iputils-20071127-output.patch:
--- NEW FILE iputils-20071127-output.patch ---
diff -up iputils-s20071127/ping_common.c.output iputils-s20071127/ping_common.c
--- iputils-s20071127/ping_common.c.output 2008-02-26 14:12:02.000000000 +0100
+++ iputils-s20071127/ping_common.c 2008-02-26 14:24:34.000000000 +0100
@@ -791,8 +791,10 @@ static long llsqrt(long long a)
*/
void finish(void)
{
- struct timeval tv = cur_time;
+ struct timeval tv;
+ char *comma = "";
+ gettimeofday(&tv, NULL);
tvsub(&tv, &start_time);
putchar('\n');
@@ -827,12 +829,15 @@ void finish(void)
(long)tmax/1000, (long)tmax%1000,
(long)tmdev/1000, (long)tmdev%1000
);
+ comma = ", ";
+ }
+ if (pipesize > 1) {
+ printf("%spipe %d", comma, pipesize);
+ comma = ", ";
}
- if (pipesize > 1)
- printf(", pipe %d", pipesize);
if (ntransmitted > 1 && nreceived && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
- printf(", ipg/ewma %d.%03d/%d.%03d ms",
+ printf("%sipg/ewma %d.%03d/%d.%03d ms", comma,
ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
}
putchar('\n');
Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- iputils.spec 25 Feb 2008 10:21:33 -0000 1.58
+++ iputils.spec 25 Mar 2008 14:00:32 -0000 1.59
@@ -1,7 +1,7 @@
Summary: Network monitoring tools including ping
Name: iputils
Version: 20071127
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
URL: http://www.skbuff.net/iputils
Group: System Environment/Daemons
@@ -21,6 +21,7 @@
Patch27: iputils-20070202-open-max.patch
Patch28: iputils-20070202-traffic_class.patch
Patch29: iputils-20070202-arping_timeout.patch
+Patch30: iputils-20071127-output.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: docbook-utils perl-SGMLSpm
@@ -54,6 +55,7 @@
%patch27 -p1 -b .open-max
%patch28 -p1 -b .traffic_class
%patch29 -p1 -b .arping_timeout
+%patch30 -p1 -b .output
%build
%ifarch s390 s390x
@@ -154,6 +156,9 @@
%{_sysconfdir}/rc.d/init.d/rdisc
%changelog
+* Tue Mar 25 2008 Martin Nagy <mnagy at redhat.com> - 20071127-2
+- fix inconsistent behaviour of ping (#360881)
+
* Mon Feb 25 2008 Martin Nagy <mnagy at redhat.com> - 20071127-1
- update to new upstream version
- Previous message (by thread): rpms/python-kaa-base/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 python-kaa-base.spec, 1.7, 1.8
- Next message (by thread): rpms/at/devel nonposix.patch,NONE,1.1 at.spec,1.64,1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list