* [PR PATCH] iperf: update to 2.1.5, adopt.
@ 2021-12-11 22:40 tornaria
2021-12-11 23:27 ` [PR PATCH] [Updated] " tornaria
2021-12-13 19:54 ` [PR PATCH] [Merged]: " Chocimier
0 siblings, 2 replies; 3+ messages in thread
From: tornaria @ 2021-12-11 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
There is a new 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/34488
iperf: update to 2.1.5, adopt.
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/34488.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iperf-34488.patch --]
[-- Type: text/x-diff, Size: 2231 bytes --]
From dddeaa0010ce5fcd52563f2186c872c17b1b2312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 11 Dec 2021 19:33:05 -0300
Subject: [PATCH] iperf: update to 2.1.5, adopt.
---
.../iperf/patches/fix-gettcpinfo-musl.patch | 20 +++++++++++++++++++
srcpkgs/iperf/template | 6 +++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
new file mode 100644
index 000000000000..71d8abf70585
--- /dev/null
+++ b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
@@ -0,0 +1,20 @@
+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
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index ba754db0d608..bcd7aa2aac28 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,16 +1,16 @@
# Template file for 'iperf'
pkgname=iperf
-version=2.1.4
+version=2.1.5
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-multicast --enable-threads
ac_cv_sizeof_bool=0"
short_desc="Perform network throughput tests"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="NCSA"
homepage="https://iperf.fr/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=062b392e87b8e227aca74fef0a99b04fe0382d4518957041b508a56885b4d4f9
+checksum=56ec1312d24bd2c78790e67c96c0a991c82e71bc4c0b0d37171bd89c9fd6ef3e
post_install() {
vlicense COPYING LICENSE
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] iperf: update to 2.1.5, adopt.
2021-12-11 22:40 [PR PATCH] iperf: update to 2.1.5, adopt tornaria
@ 2021-12-11 23:27 ` tornaria
2021-12-13 19:54 ` [PR PATCH] [Merged]: " Chocimier
1 sibling, 0 replies; 3+ messages in thread
From: tornaria @ 2021-12-11 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 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/34488
iperf: update to 2.1.5, adopt.
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/34488.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iperf-34488.patch --]
[-- Type: text/x-diff, Size: 2231 bytes --]
From adec3518184618424ffe571e4a7a31feae96d5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 11 Dec 2021 19:33:05 -0300
Subject: [PATCH] iperf: update to 2.1.5, adopt.
---
.../iperf/patches/fix-gettcpinfo-musl.patch | 20 +++++++++++++++++++
srcpkgs/iperf/template | 6 +++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
new file mode 100644
index 000000000000..71d8abf70585
--- /dev/null
+++ b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
@@ -0,0 +1,20 @@
+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
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index ba754db0d608..bcd7aa2aac28 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,16 +1,16 @@
# Template file for 'iperf'
pkgname=iperf
-version=2.1.4
+version=2.1.5
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-multicast --enable-threads
ac_cv_sizeof_bool=0"
short_desc="Perform network throughput tests"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="NCSA"
homepage="https://iperf.fr/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=062b392e87b8e227aca74fef0a99b04fe0382d4518957041b508a56885b4d4f9
+checksum=56ec1312d24bd2c78790e67c96c0a991c82e71bc4c0b0d37171bd89c9fd6ef3e
post_install() {
vlicense COPYING LICENSE
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: iperf: update to 2.1.5, adopt.
2021-12-11 22:40 [PR PATCH] iperf: update to 2.1.5, adopt tornaria
2021-12-11 23:27 ` [PR PATCH] [Updated] " tornaria
@ 2021-12-13 19:54 ` Chocimier
1 sibling, 0 replies; 3+ messages in thread
From: Chocimier @ 2021-12-13 19:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
There's a merged pull request on the void-packages repository
iperf: update to 2.1.5, adopt.
https://github.com/void-linux/void-packages/pull/34488
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-13 19:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-11 22:40 [PR PATCH] iperf: update to 2.1.5, adopt tornaria
2021-12-11 23:27 ` [PR PATCH] [Updated] " tornaria
2021-12-13 19:54 ` [PR PATCH] [Merged]: " Chocimier
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).