From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] iperf: update to 2.1.4.
Date: Sun, 03 Oct 2021 04:40:15 +0200 [thread overview]
Message-ID: <20211003024015.m8h9-AbtXTlSZC6emGVj-Mmo9BcI9EFNHPDx9rh4RXc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33250@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-10-03 2:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 3:10 [PR PATCH] " 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
2021-10-03 2:30 ` [PR PATCH] [Updated] " tornaria
2021-10-03 2:40 ` tornaria [this message]
2021-10-03 2:44 ` tornaria
2021-10-03 12:52 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211003024015.m8h9-AbtXTlSZC6emGVj-Mmo9BcI9EFNHPDx9rh4RXc@z \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).