main/iperf3: upgrade to 3.1.5

3 files changed, 40 insertions, 52 deletions

diff --git a/main/iperf3/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch b/main/iperf3/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
deleted file mode 100644
index 4d53c4bd92..0000000000
--- a/main/iperf3/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 30 Jan 2016 19:23:20 +0100
-Subject: [PATCH] Fix build using musl libc
-
-Fixes https://github.com/esnet/iperf/issues/331
----
- src/cjson.h | 2 ++
- src/timer.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/cjson.h b/src/cjson.h
-index d4449e6..7af19a9 100644
---- a/src/cjson.h
-+++ b/src/cjson.h
-@@ -23,6 +23,8 @@
- #ifndef cJSON__h
- #define cJSON__h
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C"
- {
-diff --git a/src/timer.h b/src/timer.h
-index 0f9c5eb..9b22b7f 100644
---- a/src/timer.h
-+++ b/src/timer.h
-@@ -30,6 +30,7 @@
- #ifndef __TIMER_H
- #define __TIMER_H
- 
-+#include <stdint.h>
- #include <sys/time.h>
- 
- /* TimerClientData is an opaque value that tags along with a timer.  The
diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD
index 82e9d764a9..59823c523e 100644
--- a/main/iperf3/APKBUILD
+++ b/main/iperf3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iperf3
 _pkgname=iperf
-pkgver=3.1.3
+pkgver=3.1.5
 pkgrel=0
 pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
 url="https://github.com/esnet/iperf"
@@ -12,16 +12,15 @@ depends=""
 makedepends=""
 install=""
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/iperf/archive/$pkgver.tar.gz
-	iperf.initd
-	iperf.confd
-	
-	1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/$_pkgname/archive/$pkgver.tar.gz
+	$_pkgname.initd
+	$_pkgname.confd
+
+	build-fixes.patch
 	remove-pg-flags.patch
 	"
 
 builddir="$srcdir/$_pkgname-$pkgver"
-
 build() {
 	cd "$builddir"
 	CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -33,28 +32,31 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		|| return 1
-	make || return 1
+	make -j1 || return 1
 }
 
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	install -D -m0755 "$srcdir"/$_pkgname.initd "$pkgdir"/etc/init.d/$_pkgname
-	install -D -m0644 "$srcdir"/$_pkgname.confd "$pkgdir"/etc/conf.d/$_pkgname
+
+	install -D -m0755 "$srcdir"/$_pkgname.initd \
+		"$pkgdir"/etc/init.d/$_pkgname || return 1
+	install -D -m0644 "$srcdir"/$_pkgname.confd \
+		"$pkgdir"/etc/conf.d/$_pkgname || return 1
 }
 
-md5sums="7d9e550129d1ba68d4f49ea9dd412ada  iperf3-3.1.3.tar.gz
+md5sums="effe07a36503eb2cc49cbf92430f398e  iperf3-3.1.5.tar.gz
 291084a99bc42217bf20a3f9f479e4d0  iperf.initd
 baf349898c6d08eaa3883d7e6802745c  iperf.confd
-056442b6d4bef2a390f49124150fd4c9  1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
+7105e13b94505128bc2b8d41a9f499da  build-fixes.patch
 2bbaa32466ae3a3d7cf2c26d46d97324  remove-pg-flags.patch"
-sha256sums="e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553  iperf3-3.1.3.tar.gz
+sha256sums="e1ba284bc23269f17b850d9f3ed5258719d1a62e35ec7cfc9d943bca11cb6563  iperf3-3.1.5.tar.gz
 b109c524d71a9da0db18c271b74238ef5f85b270d2f60dc6ae8f097a3342d00d  iperf.initd
 2063bd3defe0e58d43741ed6067f3f5552e579385620d0e0f5aa2b8e96b21151  iperf.confd
-3bf6329c14a30fd3ce7adaeafe5d95485111e73440fd1d91f8429e3af1c0bb63  1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
+adf9e8b7c437c2a793bf2e56638e3e3c13d0fc29fbeb41a092f6fe9de5dee279  build-fixes.patch
 35131030c9384025dc511f3fe359a0845b09ed8dede5960a7e9308ad15fccc52  remove-pg-flags.patch"
-sha512sums="67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9  iperf3-3.1.3.tar.gz
+sha512sums="12880834bb2070abcc88d03341acc795da25047b36b5815a8aabd1eff77122dcbead7549f1ebdfeb072cf6d605771eb708f1af7e776f87ea3b0ef94ac64d939d  iperf3-3.1.5.tar.gz
 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8  iperf.initd
 fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8  iperf.confd
-94a37158a1486442ef8f4a9bfb7f1fd02786dc5a3352a7249e2b5f0c910f0d2b951e40bdb94619aa8ca76ce8cda4c574a7fa85e12832c9fd684d074886aee7c7  1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
+e544ae5545f6b8ff071a1344068f9ed2bec051eb82a3b53cfccda767ea915ecf2aff5f2bf91135cba62afdb1fd421298518fa0b08339c869a4d381b1e1d396dd  build-fixes.patch
 81808862eecacdd7be658daa094385d7a57594281992b6b9b842cee676137d6990dce592b25e5db9fb80ea86628286ff7d234787d2939ef1f99820a361e1f3c6  remove-pg-flags.patch"
diff --git a/main/iperf3/build-fixes.patch b/main/iperf3/build-fixes.patch
new file mode 100644
index 0000000000..e361a86507
--- /dev/null
+++ b/main/iperf3/build-fixes.patch
@@ -0,0 +1,22 @@
+diff -upr iperf-3.1.5.orig/src/t_timer.c iperf-3.1.5/src/t_timer.c
+--- iperf-3.1.5.orig/src/t_timer.c	2017-01-17 12:19:14.044458009 +0100
++++ iperf-3.1.5/src/t_timer.c	2017-01-17 12:19:34.674090042 +0100
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #include "timer.h"
+ 
+diff -upr iperf-3.1.5.orig/src/t_uuid.c iperf-3.1.5/src/t_uuid.c
+--- iperf-3.1.5.orig/src/t_uuid.c	2017-01-17 12:20:38.013934038 +0100
++++ iperf-3.1.5/src/t_uuid.c	2017-01-17 12:20:57.200620745 +0100
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #include "iperf_util.h"
+