diff --git a/iperf-3.0.2.tar.gz b/iperf-3.0.2.tar.gz deleted file mode 100644 index 94d3c79..0000000 --- a/iperf-3.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12d250e4c45f9c5fd4429c0ce74fe6be31fe57fda6897f8eb070ab45ad387c02 -size 350972 diff --git a/iperf-3.0.2_strncat_bufferoverflow.patch b/iperf-3.0.2_strncat_bufferoverflow.patch deleted file mode 100644 index 2ac2b36..0000000 --- a/iperf-3.0.2_strncat_bufferoverflow.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Ppru iperf-3.0.2.orig/src/iperf_error.c iperf-3.0.2/src/iperf_error.c ---- iperf-3.0.2.orig/src/iperf_error.c 2014-03-10 17:58:44.000000000 +0100 -+++ iperf-3.0.2/src/iperf_error.c 2014-03-25 13:22:31.034732298 +0100 -@@ -301,11 +301,11 @@ iperf_strerror(int i_errno) - } - - if (herr || perr) -- strncat(errstr, ": ", len); -+ strncat(errstr, ": ", sizeof(errstr)-strlen(errstr)-1); - if (h_errno && herr) { -- strncat(errstr, hstrerror(h_errno), len); -+ strncat(errstr, hstrerror(h_errno), sizeof(errstr)-strlen(errstr)-1); - } else if (errno && perr) { -- strncat(errstr, strerror(errno), len); -+ strncat(errstr, strerror(errno), sizeof(errstr)-strlen(errstr)-1); - } - - return errstr; diff --git a/iperf-3.0.3.tar.gz b/iperf-3.0.3.tar.gz new file mode 100644 index 0000000..48e9598 --- /dev/null +++ b/iperf-3.0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7000eb69c31986a8ffd6665af6b0206b44d89e507219de55c667a991c75b223f +size 353436 diff --git a/iperf.changes b/iperf.changes index 1bd5c39..e3ccfb3 100644 --- a/iperf.changes +++ b/iperf.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 26 19:30:51 UTC 2014 - andreas.stieger@gmx.de + +- iperf 3.0.3 + * Summary structures in the JSON output are now included, even if + there is only one stream. + * A possible buffer overflow in iperf_error.c has been fixed + (replaced iperf-3.0.2_strncat_bufferoverflow.patch) + * Example programs now build correctly +- clean spec + ------------------------------------------------------------------- Tue Mar 25 11:24:38 UTC 2014 - aj@ajaissle.de diff --git a/iperf.spec b/iperf.spec index 1fac2d8..49e9947 100644 --- a/iperf.spec +++ b/iperf.spec @@ -16,34 +16,36 @@ # -Name: iperf -Version: 3.0.2 -Release: 0 %define soname 0 +Name: iperf +Version: 3.0.3 +Release: 0 Summary: A tool to measure network performance License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Url: https://github.com/esnet/iperf Source: https://github.com/esnet/iperf/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM -- Prevent a possible buffer overflow in strcat -Patch0: iperf-3.0.2_strncat_bufferoverflow.patch # PATCH-FIX-OPENSUSE -- Disable profiling on i586, as option -pg conflicts with -fomit-frame-pointer Patch1: iperf-3.0.2_disable-profiling.patch +%if %{?sles_version} && %{?sles_version} <= 11 BuildRequires: libuuid-devel +%else +BuildRequires: pkgconfig(uuid) +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -%{name} is a tool for active measurements of the maximum achievable bandwidth -on IP networks. It supports tuning of various parameters related to timing, -protocols, and buffers. For each test it reports the bandwidth, loss, and +%{name} is a tool for active measurements of the maximum achievable bandwidth +on IP networks. It supports tuning of various parameters related to timing, +protocols, and buffers. For each test it reports the bandwidth, loss, and other parameters. This version, sometimes referred to as iperf3, is a redesign of an original -version developed at NLANR/DAST. iperf3 is a new implementation from scratch, -with the goal of a smaller, simpler code base, and a library version of the -functionality that can be used in other programs. iperf3 also a number of -features found in other tools such as nuttcp and netperf, but were missing -from the original iperf. These include, for example, a zero-copy mode and +version developed at NLANR/DAST. iperf3 is a new implementation from scratch, +with the goal of a smaller, simpler code base, and a library version of the +functionality that can be used in other programs. iperf3 also a number of +features found in other tools such as nuttcp and netperf, but were missing +from the original iperf. These include, for example, a zero-copy mode and optional JSON output. Note that iperf3 is NOT backwards compatible with the original iperf. @@ -62,32 +64,35 @@ to run it as a shell command. Summary: A tool to measure network performance Group: Development/Libraries/C and C++ Requires: lib%{name}%{soname} = %{version} +%if %{?sles_version} && %{?sles_version} <= 11 Requires: libuuid-devel +%else +Requires: pkgconfig(uuid) +%endif %description devel -%{name} is a tool for active measurements of the maximum achievable bandwidth -on IP networks. It supports tuning of various parameters related to timing, -protocols, and buffers. For each test it reports the bandwidth, loss, and +Iperf is a tool for active measurements of the maximum achievable bandwidth +on IP networks. It supports tuning of various parameters related to timing, +protocols, and buffers. For each test it reports the bandwidth, loss, and other parameters. This package contains development files. %prep %setup -q -%patch0 -p 1 %ifarch i386 i486 i586 i686 %patch1 -p 1 %endif %build %configure -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%{__make} %{?_smp_mflags} install DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} # cleanup empty libtool .la file -%{__rm} %{buildroot}%{_libdir}/lib%{name}.la +rm %{buildroot}%{_libdir}/lib%{name}.la %post -n lib%{name}%{soname} -p /sbin/ldconfig @@ -95,7 +100,7 @@ This package contains development files. %files %defattr(-, root, root) -%doc AUTHORS LICENSE README.md RELEASE_NOTES TODO +%doc AUTHORS LICENSE README.md RELEASE_NOTES %{_bindir}/%{name}3 %doc %{_mandir}/man1/%{name}3.1%{ext_man}