iperf: update to 2.1.7.
This commit is contained in:
parent
1ac83895e5
commit
0bbbf6c41f
|
@ -1,20 +0,0 @@
|
||||||
It seems there was a broken commit meant to fix compilation on win32,
|
|
||||||
but this broke compilation on musl.
|
|
||||||
|
|
||||||
See:
|
|
||||||
|
|
||||||
https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/
|
|
||||||
|
|
||||||
for the broken commit. The current patch fixes that by completing the
|
|
||||||
definition of gettcpinfo() to what it was before the broken commit.
|
|
||||||
|
|
||||||
--- a/compat/gettcpinfo.c 2021-12-05 17:49:56.000000000 -0300
|
|
||||||
+++ b/compat/gettcpinfo.c 2021-12-11 19:29:24.850947483 -0300
|
|
||||||
@@ -99,4 +99,7 @@
|
|
||||||
};
|
|
||||||
#else
|
|
||||||
inline void gettcpinfo (int sock, struct ReportStruct *sample) {
|
|
||||||
+ sample->tcpstats.rtt = 1;
|
|
||||||
+ sample->tcpstats.isValid = false;
|
|
||||||
+};
|
|
||||||
#endif
|
|
|
@ -1,28 +0,0 @@
|
||||||
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 */
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'iperf'
|
# Template file for 'iperf'
|
||||||
pkgname=iperf
|
pkgname=iperf
|
||||||
version=2.1.6
|
version=2.1.7
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-ipv6 --enable-multicast --enable-threads
|
configure_args="--enable-ipv6 --enable-multicast --enable-threads
|
||||||
|
@ -9,8 +9,16 @@ short_desc="Perform network throughput tests"
|
||||||
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
|
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
|
||||||
license="NCSA"
|
license="NCSA"
|
||||||
homepage="https://iperf.fr/"
|
homepage="https://iperf.fr/"
|
||||||
|
changelog="https://sourceforge.net/p/iperf2/code/ci/master/tree/doc/RELEASE_NOTES?format=raw"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
|
||||||
checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080
|
checksum=1aba2e1d7aa43641ef841951ed88e16cffba898460e0c51e6b2806f3ff20e9d4
|
||||||
|
|
||||||
|
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||||
|
# do not define struct ethhdr in <linux/if_ether.h> to avoid
|
||||||
|
# redefinition in <netinet/if_ether.h>
|
||||||
|
CFLAGS="-D__UAPI_DEF_ETHHDR=0"
|
||||||
|
CXXFLAGS="-D__UAPI_DEF_ETHHDR=0"
|
||||||
|
fi
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense COPYING LICENSE
|
vlicense COPYING LICENSE
|
||||||
|
|
Loading…
Reference in a new issue