- update to 3.7
- switch from git auto tarball to a proper one
- turn off the openssl/auth code. there are some minor 64-bit
time_t issues in iperf_auth.c, easy enough to fix those but one of
these is on a sscanf line that doesn't exactly inspire confidence,
that could be revisited if anyone actually misses this feature
comments/ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/iperf3/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Jul 2018 15:36:55 -0000 1.3
+++ Makefile 26 Jun 2019 22:15:13 -0000
@@ -2,28 +2,26 @@
COMMENT= tool to measure maximum achievable bandwidth on IP networks
-V= 3.6
+V= 3.7
PKGNAME= iperf3-${V}
+DISTNAME= iperf-${V}
-GH_ACCOUNT= esnet
-GH_PROJECT= iperf
-GH_TAGNAME= ${V}
-
-SHARED_LIBS += iperf 0.0 # 0.0
+SHARED_LIBS += iperf 1.0 # 0.0
CATEGORIES= net
-HOMEPAGE= http://software.es.net/iperf/
+HOMEPAGE= https://software.es.net/iperf/
MAINTAINER= Lawrence Teo <lteo@openbsd.org>
# BSD 3-clause
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE= Yes
-WANTLIB += c crypto m ssl
+WANTLIB += c m
-MASTER_SITES= ${MASTER_SITES_GITHUB}
+MASTER_SITES= https://downloads.es.net/pub/iperf/
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --with-openssl=no
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/iperf3/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 11 Jul 2018 15:36:55 -0000 1.2
+++ distinfo 26 Jun 2019 22:15:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (iperf-3.6.tar.gz) = GtI/cKjrS4kqPLskfK+pVuD1x9i4YBsdnIAxwqgG8j8=
-SIZE (iperf-3.6.tar.gz) = 602406
+SHA256 (iperf-3.7.tar.gz) = 2EYEAiQxfK8vdchD0wmpUKfbI/m0S5RojMvlV9bRcQw=
+SIZE (iperf-3.7.tar.gz) = 605708
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 25 May 2017 12:56:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2017/05/25 12:56:35 sthen Exp $
-
-disable building the profiled binary, it wasn't installed anyway, and fails with clang
-
-Index: src/Makefile.in
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -91,8 +91,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- bin_PROGRAMS = iperf3$(EXEEXT)
--noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \
-- iperf3_profile$(EXEEXT)
-+noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
- TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Index: patches/patch-src_iperf_api_c
===================================================================
RCS file: /cvs/ports/net/iperf3/patches/patch-src_iperf_api_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_iperf_api_c
--- patches/patch-src_iperf_api_c 11 Jul 2018 15:36:55 -0000 1.3
+++ patches/patch-src_iperf_api_c 26 Jun 2019 22:15:13 -0000
@@ -1,9 +1,11 @@
$OpenBSD: patch-src_iperf_api_c,v 1.3 2018/07/11 15:36:55 gonzalo Exp $
+Default to IPv4.
+
Index: src/iperf_api.c
--- src/iperf_api.c.orig
+++ src/iperf_api.c
-@@ -2145,7 +2145,7 @@ iperf_defaults(struct iperf_test *testp)
+@@ -2314,7 +2314,7 @@ iperf_defaults(struct iperf_test *testp)
testp->stats_interval = testp->reporter_interval = 1;
testp->num_streams = 1;
Index: patches/patch-src_iperf_udp_c
===================================================================
RCS file: patches/patch-src_iperf_udp_c
diff -N patches/patch-src_iperf_udp_c
--- patches/patch-src_iperf_udp_c 11 Jul 2018 15:36:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_iperf_udp_c,v 1.2 2018/07/11 15:36:55 gonzalo Exp $
-
-Print uint64_t using %llu, size_t is 32 bits on LP32 archs.
-
-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);
- }
-
- /*
Index: patches/patch-src_timer_c
===================================================================
RCS file: patches/patch-src_timer_c
diff -N patches/patch-src_timer_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_timer_c 26 Jun 2019 22:15:13 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+for struct timeval
+
+Index: src/timer.c
+--- src/timer.c.orig
++++ src/timer.c
+@@ -28,6 +28,7 @@
+ */
+
+ #include <sys/types.h>
++#include <sys/time.h>
+ #include <stdlib.h>
+
+ #include "timer.h"
No comments:
Post a Comment