commit 7321b866f439d67c91318233e5fb444602612a9b Author: Paweł Gołaszewski <bl...@pld-linux.org> Date: Mon Nov 3 15:41:05 2014 +0100
- 3.0.3 iperf3-Werror.patch | 48 ------------------------------------------------ iperf3-nopg.patch | 19 +++++++++++-------- iperf3.spec | 23 +++++++++++------------ 3 files changed, 22 insertions(+), 68 deletions(-) --- diff --git a/iperf3.spec b/iperf3.spec index 6d3b966..0594f89 100644 --- a/iperf3.spec +++ b/iperf3.spec @@ -1,18 +1,16 @@ # TODO: # - package library and devel files %define orgname iperf -%define beta b4 Summary: Network performance measurement tool Summary(pl.UTF-8): Narzędzie do szacowania wydajności sieci Name: iperf3 -Version: 3.0 -Release: 0.%{beta}.1 +Version: 3.0.3 +Release: 0.1 License: BSD-like Group: Networking/Utilities -Source0: http://iperf.googlecode.com/files/iperf-%{version}b4.tar.gz -# Source0-md5: fde024a200b064b54accd1959f7e642e -Patch0: %{name}-Werror.patch -Patch1: %{name}-nopg.patch +Source0: http://stats.es.net/software/iperf-%{version}.tar.gz +# Source0-md5: dc5f0a7e2b3007ee3203055f000637bb +Patch0: %{name}-nopg.patch URL: http://code.google.com/p/iperf/ BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,11 +27,14 @@ that can be used in other programs. iperf3 is not backwards compatible with iperf2. %prep -%setup -q -n %{orgname}-%{version}%{beta} +%setup -q -n %{orgname}-%{version} %patch0 -p1 -%patch1 -p1 %build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__automake} %configure %{__make} @@ -43,13 +44,11 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT%{_mandir}/man1/{iperf,%{name}}.1 - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS README RELEASE_NOTES TODO +%doc AUTHORS README.md RELEASE_NOTES %attr(755,root,root) %{_bindir}/iperf3 %{_mandir}/man1/* diff --git a/iperf3-Werror.patch b/iperf3-Werror.patch deleted file mode 100644 index dbec207..0000000 --- a/iperf3-Werror.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- iperf-3.0b4/src/iperf_api.c~ 2010-08-03 01:15:27.000000000 +0200 -+++ iperf-3.0b4/src/iperf_api.c 2013-02-16 22:53:05.882124239 +0100 -@@ -48,15 +48,15 @@ - void - usage() - { -- fprintf(stderr, usage_short); -+ fprintf(stderr, "%s", usage_short); - } - - - void - usage_long() - { -- fprintf(stderr, usage_long1); -- fprintf(stderr, usage_long2); -+ fprintf(stderr, "%s", usage_long1); -+ fprintf(stderr, "%s", usage_long2); - } - - -@@ -347,7 +347,7 @@ - test->reverse = 1; - break; - case 'v': -- printf(version); -+ printf("%s", version); - exit(0); - case 'h': - default: -@@ -1163,7 +1163,7 @@ - case DISPLAY_RESULTS: - /* print final summary for all intervals */ - -- printf(report_bw_header); -+ printf("%s", report_bw_header); - - start_time = 0.; - sp = SLIST_FIRST(&test->streams); -@@ -1256,7 +1256,7 @@ - return; - } - if (sp == SLIST_FIRST(&test->streams)) { -- printf(report_bw_header); -+ printf("%s", report_bw_header); - } - - unit_snprintf(ubuf, UNIT_LEN, (double) (ir->bytes_transferred), 'A'); diff --git a/iperf3-nopg.patch b/iperf3-nopg.patch index 2467aa6..fc3002c 100644 --- a/iperf3-nopg.patch +++ b/iperf3-nopg.patch @@ -1,11 +1,14 @@ ---- iperf-3.0b4/src/Makefile.am~ 2010-07-24 01:48:45.000000000 +0200 -+++ iperf-3.0b4/src/Makefile.am 2013-02-18 11:38:48.337412987 +0100 -@@ -51,7 +51,7 @@ +--- ./src/Makefile.am.org 2014-11-03 15:31:49.488276995 +0100 ++++ ./src/Makefile.am 2014-11-03 15:32:15.456139233 +0100 +@@ -46,9 +46,9 @@ iperf3_LDFLAGS = -g iperf3_profile_SOURCES = main.c \ - $(libiperf_a_SOURCES) + $(libiperf_la_SOURCES) --iperf3_profile_CFLAGS = -pg -Wall -+iperf3_profile_CFLAGS = -Wall - iperf3_profile_LDADD = libiperf.a +-iperf3_profile_CFLAGS = -pg -g -Wall ++iperf3_profile_CFLAGS = -g -Wall + iperf3_profile_LDADD = libiperf.la +-iperf3_profile_LDFLAGS = -pg -g ++iperf3_profile_LDFLAGS = -g - # Linux installs require the uuid library explicitly linked in + # Specify the sources and various flags for the test cases + t_timer_SOURCES = t_timer.c ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/iperf3.git/commitdiff/56ccfbc12f32febd69deb596c32dc47f51411f61 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit