somlo pushed to iperf (epel7). "update to v2.0.8"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 18:22:11 UTC 2015
>From 9cd3bd34f9c334c9fa776c465a03b19cb4c67ba3 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo at cmu.edu>
Date: Fri, 10 Apr 2015 14:21:54 -0400
Subject: update to v2.0.8
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2a95d3a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/iperf-2.0.8.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e627839..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: iperf
-# $Id$
-NAME := iperf
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/iperf-2.0.8-bindfail.patch b/iperf-2.0.8-bindfail.patch
new file mode 100644
index 0000000..b18b2cf
--- /dev/null
+++ b/iperf-2.0.8-bindfail.patch
@@ -0,0 +1,42 @@
+diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp
+--- iperf-2.0.8/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Client.cpp 2015-04-10 10:05:38.279936555 -0400
+@@ -701,20 +701,20 @@ void Client::Connect( ) {
+ AF_INET
+ #endif
+ : AF_INET);
+
+ mSettings->mSock = socket( domain, type, 0 );
+- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
++ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
+
+ SetSocketOptions( mSettings );
+
+ SockAddr_localAddr( mSettings );
+ if ( mSettings->mLocalhost != NULL ) {
+ // bind socket to local address
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local,
+ SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // connect socket
+ rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer,
+ SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
+ FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings );
+diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp
+--- iperf-2.0.8/src/Listener.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Listener.cpp 2015-04-10 10:06:23.279699885 -0400
+@@ -342,11 +342,11 @@ void Listener::Listen( ) {
+ WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
+ } else
+ #endif
+ {
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // listen for connections (TCP only).
+ // default backlog traditionally 5
+ if ( !isUDP( mSettings ) ) {
+ rc = listen( mSettings->mSock, 5 );
diff --git a/iperf-2.0.8-debuginfo.patch b/iperf-2.0.8-debuginfo.patch
new file mode 100644
index 0000000..2a3ad24
--- /dev/null
+++ b/iperf-2.0.8-debuginfo.patch
@@ -0,0 +1,17 @@
+diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac
+--- iperf-2.0.8/configure.ac 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.debuginfo/configure.ac 2015-04-10 10:11:33.287445003 -0400
+@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([--
+ dnl ===================================================================
+ dnl Checks for programs
+ dnl ===================================================================
+
+ AC_PROG_CXX
+-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_PROG_CC
+-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_LANG(C)
diff --git a/iperf-2.0.8-maninstall.patch b/iperf-2.0.8-maninstall.patch
new file mode 100644
index 0000000..7f2280c
--- /dev/null
+++ b/iperf-2.0.8-maninstall.patch
@@ -0,0 +1,16 @@
+diff -NarpU5 iperf-2.0.8/man/Makefile.in iperf-2.0.8.maninstall/man/Makefile.in
+--- iperf-2.0.8/man/Makefile.in 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.maninstall/man/Makefile.in 2015-04-10 10:56:22.284937446 -0400
+@@ -289,11 +289,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+ install-man1: $(dist_man_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+- list2='$(dist_man_MANS) $(man_MANS)'; \
++ list2='$(dist_man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
diff --git a/iperf.spec b/iperf.spec
new file mode 100644
index 0000000..7766f49
--- /dev/null
+++ b/iperf.spec
@@ -0,0 +1,114 @@
+Name: iperf
+Version: 2.0.8
+Release: 1%{?dist}
+Summary: Measurement tool for TCP/UDP bandwidth performance
+License: BSD
+Group: Applications/Internet
+URL: http://sourceforge.net/projects/iperf2
+Source: http://sourceforge.net/projects/iperf2/files/%{name}-%{version}.tar.gz
+Patch0: iperf-2.0.8-debuginfo.patch
+Patch1: iperf-2.0.8-bindfail.patch
+Patch2: iperf-2.0.8-maninstall.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
+
+%description
+Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of
+various parameters and UDP characteristics. Iperf reports bandwidth, delay
+jitter, datagram loss.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+%{__autoconf}
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%make_install
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING README doc/*.gif doc/*.html
+%{_bindir}/iperf
+%{_mandir}/man*/*
+
+%changelog
+* Fri Apr 10 2015 Gabriel Somlo <somlo at cmu.edu> 2.0.8-1
+- update to 2.0.8
+- update source URL in spec file
+- rebase debuginfo and bindfail fixup patches
+- added patch to prevent error on installing manpage
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Jan 03 2014 Gabriel Somlo <somlo at cmu.edu> 2.0.5-11
+- patch to exit on port bind failure (#1047172, #1047569)
+
+* Sun Dec 22 2013 Gabriel Somlo <somlo at cmu.edu> 2.0.5-10
+- added patch to build with format security enabled (#1037132)
+
+* Tue Aug 06 2013 Gabriel Somlo <somlo at cmu.edu> 2.0.5-9
+- fix debuginfo regression (#925592)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri May 10 2013 Gabriel Somlo <somlo at cmu.edu> 2.0.5-7
+- added autoconf step to support aarch64 (#925592)
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Nov 28 2011 Gabriel Somlo <somlo at cmu.edu> 2.0.5-3
+- include man page with build (BZ 756794)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Aug 21 2010 Gabriel Somlo <somlo at cmu.edu> 2.0.5-1
+- update to 2.0.5
+
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-4
+- patched to current svn trunk to address performance issues (#506884)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 21 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-1
+- update to 2.0.4
+- patch to avoid tcp/dualtest server from quitting (bugzilla #449796), also submitted to iperf sourceforge ticket tracker (#1983829)
+
+* Sat Oct 27 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4
+- replace usleep with sched_yield to avoid hogging CPU (bugzilla #355211)
+
+* Mon Jan 29 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-3
+- patch to prevent removal of debug info by ville.sxytta(at)iki.fi
+
+* Fri Sep 08 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.2-2
+- rebuilt for FC6MassRebuild
+
+* Wed Apr 19 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.2-1
+- initial build for fedora extras (based on Dag Wieers SRPM)
+- fixed license tag: BSD (U. of IL / NCSA), not GPL
diff --git a/sources b/sources
index e69de29..2d1baf4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+186a4c6e7615f47f74823a8fe099cdbe iperf-2.0.8.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/iperf.git/commit/?h=epel7&id=9cd3bd34f9c334c9fa776c465a03b19cb4c67ba3
More information about the scm-commits
mailing list