Hello, Update for Iperf3 to 3.6:
http://software.es.net/iperf/ https://github.com/esnet/iperf/releases OK? Comments? Cheers.- -- Sending from my toaster.
Index: Makefile =================================================================== RCS file: /cvs/ports/net/iperf3/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 22 Sep 2016 02:13:18 -0000 1.2 +++ Makefile 11 Jul 2018 07:43:56 -0000 @@ -2,9 +2,8 @@ COMMENT= tool to measure maximum achievable bandwidth on IP networks -V= 3.1.3 +V= 3.6 PKGNAME= iperf3-${V} -REVISION= 0 GH_ACCOUNT= esnet GH_PROJECT= iperf @@ -21,7 +20,7 @@ MAINTAINER= Lawrence Teo <lteo@openbsd.o # BSD 3-clause PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c m +WANTLIB += c crypto m ssl MASTER_SITES= ${MASTER_SITES_GITHUB} Index: distinfo =================================================================== RCS file: /cvs/ports/net/iperf3/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 21 Sep 2016 01:12:57 -0000 1.1.1.1 +++ distinfo 11 Jul 2018 07:43:56 -0000 @@ -1,2 +1,2 @@ -SHA256 (iperf-3.1.3.tar.gz) = 40z2DP/ICqEyLSw6m4HmYsJXbSsD5T3fEHlhVjTm9VM= -SIZE (iperf-3.1.3.tar.gz) = 549466 +SHA256 (iperf-3.6.tar.gz) = GtI/cKjrS4kqPLskfK+pVuD1x9i4YBsdnIAxwqgG8j8= +SIZE (iperf-3.6.tar.gz) = 602406 Index: patches/patch-src_iperf_api_c =================================================================== RCS file: /cvs/ports/net/iperf3/patches/patch-src_iperf_api_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_iperf_api_c --- patches/patch-src_iperf_api_c 22 Sep 2016 02:13:18 -0000 1.2 +++ patches/patch-src_iperf_api_c 11 Jul 2018 07:43:56 -0000 @@ -1,12 +1,9 @@ $OpenBSD: patch-src_iperf_api_c,v 1.2 2016/09/22 02:13:18 lteo Exp $ -Default to IPv4. - -Missing initialization. - ---- src/iperf_api.c.orig Mon Jun 6 14:18:49 2016 -+++ src/iperf_api.c Sun Sep 18 01:51:24 2016 -@@ -1839,7 +1839,7 @@ iperf_defaults(struct iperf_test *testp) +Index: src/iperf_api.c +--- src/iperf_api.c.orig ++++ src/iperf_api.c +@@ -2145,7 +2145,7 @@ iperf_defaults(struct iperf_test *testp) testp->stats_interval = testp->reporter_interval = 1; testp->num_streams = 1; @@ -15,12 +12,3 @@ Missing initialization. testp->settings->unit_format = 'a'; testp->settings->socket_bufsize = 0; /* use autotuning */ testp->settings->blksize = DEFAULT_TCP_BLKSIZE; -@@ -2323,7 +2323,7 @@ iperf_print_results(struct iperf_test *test) - struct iperf_stream *sp = NULL; - iperf_size_t bytes_sent, total_sent = 0; - iperf_size_t bytes_received, total_received = 0; -- double start_time, end_time, avg_jitter = 0.0, lost_percent; -+ double start_time, end_time = 0.0, avg_jitter = 0.0, lost_percent; - double bandwidth; - - /* print final summary for all intervals */ Index: patches/patch-src_iperf_udp_c =================================================================== RCS file: /cvs/ports/net/iperf3/patches/patch-src_iperf_udp_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_iperf_udp_c --- patches/patch-src_iperf_udp_c 21 Sep 2016 01:12:57 -0000 1.1.1.1 +++ patches/patch-src_iperf_udp_c 11 Jul 2018 07:43:56 -0000 @@ -2,14 +2,15 @@ $OpenBSD: patch-src_iperf_udp_c,v 1.1.1. Print uint64_t using %llu, size_t is 32 bits on LP32 archs. ---- src/iperf_udp.c.orig Mon Sep 19 14:17:14 2016 -+++ src/iperf_udp.c Mon Sep 19 14:18:04 2016 -@@ -104,7 +104,7 @@ iperf_udp_recv(struct iperf_stream *sp) - sp->packet_count = pcount; - } else { - sp->outoforder_packets++; -- iperf_err(sp->test, "OUT OF ORDER - incoming packet = %zu and received packet = %d AND SP = %d", pcount, sp->packet_count, sp->socket); -+ iperf_err(sp->test, "OUT OF ORDER - incoming packet = %llu and received packet = %d AND SP = %d", pcount, sp->packet_count, sp->socket); - } +Index: src/iperf_udp.c +--- src/iperf_udp.c.orig ++++ src/iperf_udp.c +@@ -149,7 +149,7 @@ iperf_udp_recv(struct iperf_stream *sp) + + /* Log the out-of-order packet */ + if (sp->test->debug) +- fprintf(stderr, "OUT OF ORDER - incoming packet sequence %" PRIu64 " but expected sequence %d on stream %d", pcount, sp->packet_count, sp->socket); ++ fprintf(stderr, "OUT OF ORDER - incoming packet sequence %llu" PRIu64 " but expected sequence %d on stream %d", pcount, sp->packet_count, sp->socket); + } - /* jitter measurement */ + /* Index: patches/patch-src_portable_endian_h =================================================================== RCS file: patches/patch-src_portable_endian_h diff -N patches/patch-src_portable_endian_h --- patches/patch-src_portable_endian_h 21 Sep 2016 01:12:57 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_portable_endian_h,v 1.1.1.1 2016/09/21 01:12:57 lteo Exp $ - -Avoid #define redefinitions. - ---- src/portable_endian.h.orig Mon Sep 19 14:18:25 2016 -+++ src/portable_endian.h Mon Sep 19 14:20:10 2016 -@@ -12,7 +12,7 @@ - - // GLIBC / Linux with endian(3) support, which was added in glibc 2.9. - // Intended to support CentOS 6 and newer. --#if defined(__linux__) && \ -+#if defined(__OpenBSD__) || defined(__linux__) && \ - ((__GLIBC__ > 3) || \ - (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) -