Skip to contentSkip to conversation

iperf: bump to version 2.0.9

PATCH New Baruch Siach 3 participants 9 messages Jul 29, 2016 – Aug 5, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

iperf2 is a fork of the original unmaintained iperf project, that continues the development of the iperf 2.x series. Update homepage link, and download location.

---
 package/iperf/0001-add-missing-header.patch | 28 ++++++++++++++++++++++++++++
 package/iperf/Config.in                     |  2 +-
 package/iperf/iperf.hash                    |  4 +++-
 package/iperf/iperf.mk                      |  4 ++--
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 package/iperf/0001-add-missing-header.patch
package/iperf/0001-add-missing-header.patch new file +28 -0
new file mode 100644
index 000000000000..112738ea25ed
@@ -0,0 +1,28 @@
+util.h: add missing stdbool header
+
+C requires the stdbool.h header for the 'bool' type.
+
+Fixes the following build failure under uClibc-ng C library:
+
+.../arm-linux-gcc -DHAVE_CONFIG_H -I. -I..  -I../include -I../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -c delay.c
+In file included from delay.c:55:0:
+../include/util.h:73:1: error: unknown type name ?bool?
+ bool setsock_blocking(int fd, bool blocking);
+ ^
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Patch status: sent to iperf2 maintainer
+
+diff -Nuar iperf-2.0.9.orig/include/util.h iperf-2.0.9/include/util.h
+--- iperf-2.0.9.orig/include/util.h	2016-06-06 21:48:21.000000000 +0300
++++ iperf-2.0.9/include/util.h	2016-07-29 11:27:23.028224148 +0300
+@@ -57,6 +57,8 @@
+     #include "config.h"
+ #endif
+ 
++#include <stdbool.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
package/iperf/Config.in +1 -1
index 86dd3e97c98c..21a2df8ace89 100644
@@ -7,7 +7,7 @@ config BR2_PACKAGE_IPERF
 	  Internet Protocol bandwidth measuring tool for measuring
 	  TCP/UDP performance.
 
-	  http://dast.nlanr.net/projects/iperf/
+	  https://sourceforge.net/projects/iperf2/
 
 comment "iperf needs a toolchain w/ C++"
 	depends on BR2_USE_MMU
package/iperf/iperf.hash +3 -1
index 8d93b723d044..3dd491a2c0ee 100644
@@ -1,2 +1,4 @@
+# From https://sourceforge.net/projects/iperf2/files/
+sha1	9e215f6af8edd97f947f2b0207ff5487845d83d4	iperf-2.0.9.tar.gz
 # Locally computed:
-sha256  636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b  iperf-2.0.5.tar.gz
+sha256  a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6  iperf-2.0.9.tar.gz
package/iperf/iperf.mk +2 -2
index 8496b95d83cc..f769238e4fc8 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-IPERF_VERSION = 2.0.5
-IPERF_SITE = http://downloads.sourceforge.net/project/iperf
+IPERF_VERSION = 2.0.9
+IPERF_SITE = https://sourceforge.net/projects/iperf2/files
 IPERF_LICENSE = MIT-like
 IPERF_LICENSE_FILES = COPYING
 
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Quoted 37 lines · Baruch Siach

iperf2 is a fork of the original unmaintained iperf project, that continues the development of the iperf 2.x series. Update homepage link, and download location.

---

package/iperf/0001-add-missing-header.patch | 28 ++++++++++++++++++++++++++++
package/iperf/Config.in                     |  2 +-
package/iperf/iperf.hash                    |  4 +++-
package/iperf/iperf.mk                      |  4 ++--
4 files changed, 34 insertions(+), 4 deletions(-)

create mode 100644 package/iperf/0001-add-missing-header.patch

package/iperf/0001-add-missing-header.patch new file +15 -0
new file mode 100644
index 000000000000..112738ea25ed
@@ -0,0 +1,28 @@
+util.h: add missing stdbool header
+
+C requires the stdbool.h header for the 'bool' type.
+
+Fixes the following build failure under uClibc-ng C library:
+
+.../arm-linux-gcc -DHAVE_CONFIG_H -I. -I..  -I../include -I../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -c delay.c
+In file included from delay.c:55:0:
+../include/util.h:73:1: error: unknown type name ?bool?
+ bool setsock_blocking(int fd, bool blocking);
+ ^
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Patch status: sent to iperf2 maintainer

package/iperf/0001-add-missing-header.patch line 25

Quoted 10 lines
package/iperf/0001-add-missing-header.patch new file +10 -0
+
+diff -Nuar iperf-2.0.9.orig/include/util.h iperf-2.0.9/include/util.h
+--- iperf-2.0.9.orig/include/util.h	2016-06-06 21:48:21.000000000 +0300
++++ iperf-2.0.9/include/util.h	2016-07-29 11:27:23.028224148 +0300
+@@ -57,6 +57,8 @@
+     #include "config.h"
+ #endif
+
++#include <stdbool.h>
++

you should also ask compiler to use c99 if you wan to use stdbool so add -std=c99 or -std=gnu99 to the compiler cmdline

Quoted 41 lines
package/iperf/0001-add-missing-header.patch new file +3 -0
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
package/iperf/Config.in +1 -1
index 86dd3e97c98c..21a2df8ace89 100644
@@ -7,7 +7,7 @@ config BR2_PACKAGE_IPERF
 	  Internet Protocol bandwidth measuring tool for measuring
 	  TCP/UDP performance.
 
-	  http://dast.nlanr.net/projects/iperf/
+	  https://sourceforge.net/projects/iperf2/
 

comment "iperf needs a toolchain w/ C++"
depends on BR2_USE_MMU

package/iperf/iperf.hash +3 -1
index 8d93b723d044..3dd491a2c0ee 100644
@@ -1,2 +1,4 @@
+# From https://sourceforge.net/projects/iperf2/files/
+sha1	9e215f6af8edd97f947f2b0207ff5487845d83d4	iperf-2.0.9.tar.gz
 # Locally computed:
-sha256  636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b  iperf-2.0.5.tar.gz
+sha256  a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6  iperf-2.0.9.tar.gz
package/iperf/iperf.mk +2 -2
index 8496b95d83cc..f769238e4fc8 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-IPERF_VERSION = 2.0.5
-IPERF_SITE = http://downloads.sourceforge.net/project/iperf
+IPERF_VERSION = 2.0.9
+IPERF_SITE = https://sourceforge.net/projects/iperf2/files

IPERF_LICENSE = MIT-like
IPERF_LICENSE_FILES = COPYING

Quoted 7 lines

--
2.8.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160729/a5b03c32/attachment.asc>

#2 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

In reply to Baruch Siach

Hello,

Quoted 4 lines · Baruch Siach

iperf2 is a fork of the original unmaintained iperf project, that continues the development of the iperf 2.x series. Update homepage link, and download location.

Quoted 8 lines
---
 package/iperf/0001-add-missing-header.patch | 28 ++++++++++++++++++++++++++++
 package/iperf/Config.in                     |  2 +-
 package/iperf/iperf.hash                    |  4 +++-
 package/iperf/iperf.mk                      |  4 ++--
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 package/iperf/0001-add-missing-header.patch

I've applied, after doing the following changes:

[Thomas:
- change the download location to use downloads.sourceforge.net
- turn the patch into a Git-formatted one, since upstream uses Git as its version control system
- as noticed by Khem Raj, a C99 compiler is needed for the bool type, so added AC_PROG_CC_C99 to configure.ac, and consequently added IPERF_AUTORECONF = YES.
- removed two <pkg>_CONF_ENV variables related to the bool type, they were added by an older commit e13ac0ec8788092c6508636da94fe0198c18dffd back when we had a config.cache shared between packages (which is no longer the case today)]

If you could submit the updated patch upstream, it would be good. Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Hi Thomas,

Quoted 14 lines · Thomas Petazzoni
Quoted 4 lines · Baruch Siach

iperf2 is a fork of the original unmaintained iperf project, that continues the development of the iperf 2.x series. Update homepage link, and download location.

Quoted 8 lines
---
 package/iperf/0001-add-missing-header.patch | 28 ++++++++++++++++++++++++++++
 package/iperf/Config.in                     |  2 +-
 package/iperf/iperf.hash                    |  4 +++-
 package/iperf/iperf.mk                      |  4 ++--
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 package/iperf/0001-add-missing-header.patch
Quoted 4 lines

I've applied, after doing the following changes:

[Thomas:
- change the download location to use downloads.sourceforge.net

What is the advantage of downloads.sourceforge.net? Many packages still use just sourceforge.net:

$ git grep _SITE[^\.]*sourceforge -- package/ |wc -l
20
Quoted 2 lines

- turn the patch into a Git-formatted one, since upstream uses Git as its version control system

Where have you found a link to that repo? Only after googling for "iperf2 git" I found an indication to its existence in https://github.com/daynix/iperf2.

Quoted 10 lines

- as noticed by Khem Raj, a C99 compiler is needed for the bool type, so added AC_PROG_CC_C99 to configure.ac, and consequently added IPERF_AUTORECONF = YES.
- removed two <pkg>_CONF_ENV variables related to the bool type, they were added by an older commit e13ac0ec8788092c6508636da94fe0198c18dffd back when we had a config.cache shared between packages (which is no longer the case today)]

If you could submit the updated patch upstream, it would be good.

Thanks,
baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#4 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Hello,

Quoted 5 lines · Baruch Siach
Quoted 2 lines

[Thomas:
- change the download location to use downloads.sourceforge.net

What is the advantage of downloads.sourceforge.net? Many packages still use just sourceforge.net:

Consistency amongst all packages? There are 181 packages that use downloads.sourceforge.net...

Quoted 3 lines
$ git grep _SITE[^\.]*sourceforge -- package/ |wc -l
20

... which is a lot more than 20 packages.

Quoted 5 lines
Quoted 2 lines

- turn the patch into a Git-formatted one, since upstream uses Git as its version control system

Where have you found a link to that repo? Only after googling for "iperf2 git" I found an indication to its existence in https://github.com/daynix/iperf2.

From https://sourceforge.net/projects/iperf2/, click on "Code".

(Yes the SourceForge UI is terrible).

Quoted 10 lines
Quoted 10 lines

- as noticed by Khem Raj, a C99 compiler is needed for the bool type, so added AC_PROG_CC_C99 to configure.ac, and consequently added IPERF_AUTORECONF = YES.
- removed two <pkg>_CONF_ENV variables related to the bool type, they were added by an older commit e13ac0ec8788092c6508636da94fe0198c18dffd back when we had a config.cache shared between packages (which is no longer the case today)]

If you could submit the updated patch upstream, it would be good.

Well, I was hoping you would do it :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Hi Thomas,

Quoted 7 lines · Thomas Petazzoni
Quoted 5 lines · Baruch Siach
Quoted 2 lines

[Thomas:
- change the download location to use downloads.sourceforge.net

What is the advantage of downloads.sourceforge.net? Many packages still use just sourceforge.net:

Quoted 7 lines

Consistency amongst all packages? There are 181 packages that use downloads.sourceforge.net...

Quoted 2 lines
$ git grep _SITE[^\.]*sourceforge -- package/ |wc -l
20

... which is a lot more than 20 packages.

OK.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

- turn the patch into a Git-formatted one, since upstream uses Git as its version control system

Where have you found a link to that repo? Only after googling for "iperf2 git" I found an indication to its existence in https://github.com/daynix/iperf2.

From https://sourceforge.net/projects/iperf2/, click on "Code".

That's the first thing I tried. Looking there again all I see is an old Svn repo (last update is r8 from 2014-09-14). What am I missing?

Quoted 11 lines

(Yes the SourceForge UI is terrible).

Quoted 9 lines
Quoted 9 lines

- as noticed by Khem Raj, a C99 compiler is needed for the bool type, so added AC_PROG_CC_C99 to configure.ac, and consequently added IPERF_AUTORECONF = YES.
- removed two <pkg>_CONF_ENV variables related to the bool type, they were added by an older commit e13ac0ec8788092c6508636da94fe0198c18dffd back when we had a config.cache shared between packages (which is no longer the case today)]

Quoted 3 lines
Quoted 1 line
Quoted 1 line

If you could submit the updated patch upstream, it would be good.

Well, I was hoping you would do it :-)

It's on my TODO (AKA mail Inbox).

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#6 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Hello,

Quoted 7 lines · Baruch Siach
Quoted 4 lines
Quoted 2 lines

Where have you found a link to that repo? Only after googling for "iperf2 git" I found an indication to its existence in https://github.com/daynix/iperf2.

From https://sourceforge.net/projects/iperf2/, click on "Code".

That's the first thing I tried. Looking there again all I see is an old Svn repo (last update is r8 from 2014-09-14). What am I missing?

Then we don't have the same Internet I'm afraid. Here the "Code" tab points to https://sourceforge.net/p/iperf2/code/ci/master/tree/ which is a Git repository with the latest commit on July 2, 2016.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Hi Thomas,

Quoted 4 lines · Thomas Petazzoni
Quoted 3 lines · Baruch Siach
Quoted 3 lines
Quoted 2 lines

Where have you found a link to that repo? Only after googling for "iperf2 git" I found an indication to its existence in https://github.com/daynix/iperf2.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

From https://sourceforge.net/projects/iperf2/, click on "Code".

That's the first thing I tried. Looking there again all I see is an old Svn repo (last update is r8 from 2014-09-14). What am I missing?

Then we don't have the same Internet I'm afraid. Here the "Code" tab points to https://sourceforge.net/p/iperf2/code/ci/master/tree/ which is a Git repository with the latest commit on July 2, 2016.

Now I see it. There are TWO "Code" links at
https://sourceforge.net/projects/iperf2/. The left one (between "Wiki" and "Tickets") points to the current git repo, while the right one (right most) points to the old Svn repo. I'm just used to look for the "Code" link at the right on SF project's summary pages.

Thanks,
baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#8 lore raw

PATCH 1/1 iperf: bump to version 2.0.9

Hello,

Quoted 9 lines · Baruch Siach
Quoted 3 lines

Then we don't have the same Internet I'm afraid. Here the "Code" tab points to https://sourceforge.net/p/iperf2/code/ci/master/tree/ which is a Git repository with the latest commit on July 2, 2016.

Now I see it. There are TWO "Code" links at
https://sourceforge.net/projects/iperf2/. The left one (between "Wiki" and "Tickets") points to the current git repo, while the right one (right most) points to the old Svn repo. I'm just used to look for the "Code" link at the right on SF project's summary pages.

Aaah, I see your "Code" link now. There are indeed two "Code" tabs. This SourceForge thing is really terrible.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com