From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 8 Nov 2015 06:22:30 +0000 (-0500)
Subject: iperf3: Update from 3.0.11 to 3.1
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/b34656aa6595bd3c8d25acf86b65322171f29631?hp=f532079a161783ff951dd77cf5199634e6d6f291

iperf3: Update from 3.0.11 to 3.1
---

diff --git a/packages/iperf3/build.sh b/packages/iperf3/build.sh
index 317cd53f..cc0e2558 100644
--- a/packages/iperf3/build.sh
+++ b/packages/iperf3/build.sh
@@ -1,4 +1,4 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/esnet/iperf
 TERMUX_PKG_DESCRIPTION="TCP, UDP, and SCTP network bandwidth measurement tool"
-TERMUX_PKG_VERSION=3.0.11
+TERMUX_PKG_VERSION=3.1
 TERMUX_PKG_SRCURL=http://downloads.es.net/pub/iperf/iperf-${TERMUX_PKG_VERSION}.tar.gz
diff --git a/packages/iperf3/flowlabel.h.patch b/packages/iperf3/flowlabel.h.patch
deleted file mode 100644
index f8a2694b..00000000
--- a/packages/iperf3/flowlabel.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r ../iperf-3.0.3/src/flowlabel.h ./src/flowlabel.h
---- ../iperf-3.0.3/src/flowlabel.h	2014-03-26 19:06:38.000000000 +0100
-+++ ./src/flowlabel.h	2014-06-16 08:32:24.788283978 +0200
-@@ -19,6 +19,7 @@
-    conflicts with "netinet/in.h" .
- */
- 
-+#ifndef __ANDROID__
- struct in6_flowlabel_req
- {
-     struct in6_addr flr_dst;
-@@ -31,6 +32,7 @@
-     __u32   __flr_pad;
-     /* Options in format of IPV6_PKTOPTIONS */
- };
-+#endif
- 
- #define IPV6_FL_A_GET           0
- #define IPV6_FL_A_PUT           1
diff --git a/packages/iperf3/iperf_api.c.patch b/packages/iperf3/iperf_api.c.patch
index 1a6f05d2..0bca8f98 100644
--- a/packages/iperf3/iperf_api.c.patch
+++ b/packages/iperf3/iperf_api.c.patch
@@ -1,12 +1,12 @@
-diff -u -r ../iperf-3.0.3/src/iperf_api.c ./src/iperf_api.c
---- ../iperf-3.0.3/src/iperf_api.c	2014-03-26 19:06:38.000000000 +0100
-+++ ./src/iperf_api.c	2014-06-16 08:51:00.128253488 +0200
-@@ -2153,7 +2169,7 @@
- {
-     int i;
-     struct iperf_stream *sp;
--    char template[] = "/tmp/iperf3.XXXXXX";
-+    char template[] = "@TERMUX_PREFIX@/tmp/iperf3.XXXXXX";
- 
-     h_errno = 0;
+diff -u -r ../iperf-3.1/src/iperf_api.c ./src/iperf_api.c
+--- ../iperf-3.1/src/iperf_api.c	2015-10-16 13:01:09.000000000 -0400
++++ ./src/iperf_api.c	2015-11-08 01:20:52.345913816 -0500
+@@ -2594,7 +2594,7 @@
+     if (test->template) {
+         snprintf(template, sizeof(template) / sizeof(char), "%s", test->template);
+     } else {
+-        char buf[] = "/tmp/iperf3.XXXXXX";
++        char buf[] = "@TERMUX_PREFIX@/tmp/iperf3.XXXXXX";
+         snprintf(template, sizeof(template) / sizeof(char), "%s", buf);
+     }
  
diff --git a/packages/iperf3/iperf_util.h.patch b/packages/iperf3/iperf_util.h.patch
deleted file mode 100644
index 04305424..00000000
--- a/packages/iperf3/iperf_util.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r ../iperf-3.0.3/src/iperf_util.h ./src/iperf_util.h
---- ../iperf-3.0.3/src/iperf_util.h	2014-03-26 19:06:38.000000000 +0100
-+++ ./src/iperf_util.h	2014-06-16 08:33:18.668282505 +0200
-@@ -11,6 +11,7 @@
- #define __IPERF_UTIL_H
- 
- #include "cjson.h"
-+#include <sys/select.h>
- 
- void make_cookie(char *);
-