* Re: iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
@ 2021-10-02 3:16 ` tornaria
2021-10-02 9:35 ` paper42
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2021-10-02 3:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/33250#issuecomment-932672437
Comment:
On CI there are two test failures (tcp6 and udp6) but everything passes on my box (tested x86_64, x86_64-musl, i686).
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
2021-10-02 3:16 ` tornaria
@ 2021-10-02 9:35 ` paper42
2021-10-02 18:59 ` tornaria
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-10-02 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33250#issuecomment-932722598
Comment:
In that case, either add `make_check=ci-skip` or patch out the failing tests if there is only a few of them.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
2021-10-02 3:16 ` tornaria
2021-10-02 9:35 ` paper42
@ 2021-10-02 18:59 ` tornaria
2021-10-02 19:49 ` paper42
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2021-10-02 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/33250#issuecomment-932804234
Comment:
> In that case, either add `make_check=ci-skip` or patch out the failing tests if there is only a few of them.
All the tests pass when I run in my box. Two of the tests fail when run on ci (the tests or tcp6 and udp6). Should I *conditionally* disable these two only when run in CI? How can I know when I'm running on CI?
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
` (2 preceding siblings ...)
2021-10-02 18:59 ` tornaria
@ 2021-10-02 19:49 ` paper42
2021-10-03 2:30 ` [PR PATCH] [Updated] " tornaria
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-10-02 19:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33250#issuecomment-932811632
Comment:
> > In that case, either add `make_check=ci-skip` or patch out the failing tests if there is only a few of them.
>
> All the tests pass when I run in my box. Two of the tests fail when run on ci (the tests or tcp6 and udp6). Should I _conditionally_ disable these two only when run in CI? How can I know when I'm running on CI?
It will be easier to disable them in all situations, even outside CI.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
` (3 preceding siblings ...)
2021-10-02 19:49 ` paper42
@ 2021-10-03 2:30 ` tornaria
2021-10-03 2:40 ` tornaria
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2021-10-03 2:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages iperf
https://github.com/void-linux/void-packages/pull/33250
iperf: update to 2.1.4.
#### Have the results of the proposed changes been tested?
- I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/33250.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iperf-33250.patch --]
[-- Type: text/x-diff, Size: 3268 bytes --]
From c1c19125eddd9e7a388c73f9b0b5e0a59bf439bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 1 Oct 2021 23:48:38 -0300
Subject: [PATCH] iperf: update to 2.1.4.
---
.../patches/reorder-includes-for-musl.patch | 28 +++++++++++++++++++
.../skip-ip6-tests-if-not-available.patch | 26 +++++++++++++++++
srcpkgs/iperf/template | 4 +--
3 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch
create mode 100644 srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
new file mode 100644
index 000000000000..066620c8666c
--- /dev/null
+++ b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
@@ -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 */
diff --git a/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch b/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
new file mode 100644
index 000000000000..5de2ea3d2094
--- /dev/null
+++ b/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
@@ -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/5001) 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/5001) 2> /dev/null || exit 77
++
+ # usage:
+ # run_iperf -s server args -c client args
+ #
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index d992f0d3d67b..ba754db0d608 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
` (4 preceding siblings ...)
2021-10-03 2:30 ` [PR PATCH] [Updated] " tornaria
@ 2021-10-03 2:40 ` tornaria
2021-10-03 2:44 ` tornaria
2021-10-03 12:52 ` [PR PATCH] [Merged]: " leahneukirchen
7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2021-10-03 2:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages iperf
https://github.com/void-linux/void-packages/pull/33250
iperf: update to 2.1.4.
#### Have the results of the proposed changes been tested?
- I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/33250.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iperf-33250.patch --]
[-- Type: text/x-diff, Size: 3270 bytes --]
From 570840007b35013f5f9334d0567267fd1896316d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 1 Oct 2021 23:48:38 -0300
Subject: [PATCH] iperf: update to 2.1.4.
---
.../patches/reorder-includes-for-musl.patch | 28 +++++++++++++++++++
.../skip-ip6-tests-if-not-available.patch | 26 +++++++++++++++++
srcpkgs/iperf/template | 4 +--
3 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch
create mode 100644 srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
new file mode 100644
index 000000000000..066620c8666c
--- /dev/null
+++ b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
@@ -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 */
diff --git a/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch b/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
new file mode 100644
index 000000000000..b098195bd6d9
--- /dev/null
+++ b/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
@@ -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
+ #
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index d992f0d3d67b..ba754db0d608 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
` (5 preceding siblings ...)
2021-10-03 2:40 ` tornaria
@ 2021-10-03 2:44 ` tornaria
2021-10-03 12:52 ` [PR PATCH] [Merged]: " leahneukirchen
7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2021-10-03 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/33250#issuecomment-932852099
Comment:
I added a patch to skip IP6 tests when IP6 is not available. Now all tests pass on my box (which has ip6 enabled) and on CI the two tests are skipped (since ip6 is disabled).
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Merged]: iperf: update to 2.1.4.
2021-10-02 3:10 [PR PATCH] iperf: update to 2.1.4 tornaria
` (6 preceding siblings ...)
2021-10-03 2:44 ` tornaria
@ 2021-10-03 12:52 ` leahneukirchen
7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2021-10-03 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
There's a merged pull request on the void-packages repository
iperf: update to 2.1.4.
https://github.com/void-linux/void-packages/pull/33250
Description:
#### Have the results of the proposed changes been tested?
- I generally don't use the affected packages but briefly tested this PR
^ permalink raw reply [flat|nested] 9+ messages in thread