iperf: update to 2.1.4.

This commit is contained in:
Gonzalo Tornaría 2021-10-01 23:48:38 -03:00 committed by Leah Neukirchen
parent fd4334dc9f
commit e1178e2215
3 changed files with 56 additions and 2 deletions

View file

@ -0,0 +1,28 @@
Change order of includes to fix compilation with musl libc
--- a/include/headers.h 2021-08-16 14:27:51.000000000 -0300
+++ b/include/headers.h 2021-10-01 23:42:09.471528972 -0300
@@ -106,11 +106,6 @@
#include <net/if.h>
#endif
-#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
-#include <linux/if_tun.h>
-#include <sys/ioctl.h>
-#endif
-
// AF_PACKET HEADERS
#if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET)
@@ -146,6 +141,11 @@
#define IPV6HDRLEN 40
#endif // HAVE_AF_PACKET
+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
+#include <linux/if_tun.h>
+#include <sys/ioctl.h>
+#endif
+
#ifdef WIN32
/* Windows config file */

View file

@ -0,0 +1,26 @@
Skip ip6 tests when ip6 is not available
--- a/t/t2_tcp6.sh 2021-08-09 14:15:27.000000000 -0300
+++ b/t/t2_tcp6.sh 2021-10-02 23:13:59.832306995 -0300
@@ -1,6 +1,9 @@
#!/bin/bash -e
. $(dirname $0)/base.sh
+# SKIP if ip6 not available
+(< /dev/udp/$ip6/$port) 2> /dev/null || exit 77
+
# usage:
# run_iperf -s server args -c client args
#
--- a/t/t4_udp6.sh 2021-08-09 14:15:27.000000000 -0300
+++ b/t/t4_udp6.sh 2021-10-02 23:13:57.274282598 -0300
@@ -1,6 +1,9 @@
#!/bin/bash -e
. $(dirname $0)/base.sh
+# SKIP if ip6 not available
+(< /dev/udp/$ip6/$port) 2> /dev/null || exit 77
+
# usage:
# run_iperf -s server args -c client args
#

View file

@ -1,6 +1,6 @@
# Template file for 'iperf'
pkgname=iperf
version=2.0.13
version=2.1.4
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-multicast --enable-threads
@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="NCSA"
homepage="https://iperf.fr/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
checksum=c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad
checksum=062b392e87b8e227aca74fef0a99b04fe0382d4518957041b508a56885b4d4f9
post_install() {
vlicense COPYING LICENSE