diff --git a/packages/iperf3/build.sh b/packages/iperf3/build.sh index 8ab0a87dc..3d3f58a11 100644 --- a/packages/iperf3/build.sh +++ b/packages/iperf3/build.sh @@ -1,5 +1,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/esnet/iperf TERMUX_PKG_DESCRIPTION="TCP, UDP, and SCTP network bandwidth measurement tool" -TERMUX_PKG_VERSION=3.1.7 +TERMUX_PKG_VERSION=3.2 +TERMUX_PKG_SHA256=f207b36f861485845dbdf09f909c62f3d2222a3cf3d2682095aede8213cd9c1d TERMUX_PKG_SRCURL=http://downloads.es.net/pub/iperf/iperf-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=a4ef73406fe92250602b8da2ae89ec53211f805df97a1d1d629db5a14043734f +TERMUX_PKG_DEPENDS="openssl" diff --git a/packages/iperf3/iperf.h.patch b/packages/iperf3/iperf.h.patch deleted file mode 100644 index f3eda23a0..000000000 --- a/packages/iperf3/iperf.h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r ../iperf-3.0.3/src/iperf.h ./src/iperf.h ---- ../iperf-3.0.3/src/iperf.h 2014-03-26 19:06:38.000000000 +0100 -+++ ./src/iperf.h 2014-06-16 08:27:57.300291290 +0200 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include "timer.h" - #include "queue.h" diff --git a/packages/iperf3/iperf_api.c.patch b/packages/iperf3/iperf_api.c.patch deleted file mode 100644 index 0bca8f985..000000000 --- a/packages/iperf3/iperf_api.c.patch +++ /dev/null @@ -1,12 +0,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/src-iperf_api.c.patch b/packages/iperf3/src-iperf_api.c.patch new file mode 100644 index 000000000..0ae7f50bc --- /dev/null +++ b/packages/iperf3/src-iperf_api.c.patch @@ -0,0 +1,12 @@ +diff -u -r ../iperf-3.2/src/iperf_api.c ./src/iperf_api.c +--- ../iperf-3.2/src/iperf_api.c 2017-06-26 19:42:56.000000000 +0200 ++++ ./src/iperf_api.c 2017-07-26 14:00:54.136126122 +0200 +@@ -3168,7 +3168,7 @@ + tempdir = getenv("TMP"); + } + if (tempdir == 0){ +- tempdir = "/tmp"; ++ tempdir = "@TERMUX_PREFIX@/tmp"; + } + snprintf(template, sizeof(template) / sizeof(char), "%s/iperf3.XXXXXX", tempdir); + }